[meld] meldwindow: Pass through the encoding option to set_files

[Kai Willadsen <kaiw src gnome org>]

commit cd5d09580dfc03ab803d7679b16bc6056c672cb8
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Jun 14 07:22:56 2017 +1000

    meldwindow: Pass through the encoding option to set_files
    
    This also makes the additional options keyword-only, since we should
    always be doing this anyway.

 meld/meldwindow.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 771bf4b..467e4e9 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -575,11 +575,12 @@ class MeldWindow(gnomeglade.Component):
             doc.scheduler.add_task(doc.auto_compare)
         return doc
 
-    def append_filediff(self, gfiles, merge_output=None, meta=None):
+    def append_filediff(
+            self, gfiles, *, encodings=None, merge_output=None, meta=None):
         assert len(gfiles) in (1, 2, 3)
         doc = filediff.FileDiff(len(gfiles))
         self._append_page(doc, "text-x-generic")
-        doc.set_files(gfiles)
+        doc.set_files(gfiles, encodings)
         if merge_output is not None:
             doc.set_merge_output_file(merge_output)
         if meta is not None: