[meld] filediff: Reuse buffer encodings on revert use

[Kai Willadsen <kaiw src gnome org>]

commit fdfe7544acec80832de3cef9d6d4103a175a2d3e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 10 07:44:37 2017 +1000

    filediff: Reuse buffer encodings on revert use

 meld/filediff.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 2615c1f..491eac4 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1698,9 +1698,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             dialog.widget.destroy()
 
         if response == Gtk.ResponseType.OK:
-            gfiles = [b.data.gfile for b in self.textbuffer[:self.num_panes]]
-            # TODO: Make sure to reuse file encodings if present
-            self.set_files(gfiles)
+            buffers = self.textbuffer[:self.num_panes]
+            gfiles = [b.data.gfile for b in buffers]
+            encodings = [b.data.encoding for b in buffers]
+            self.set_files(gfiles, encodings=encodings)
 
     def on_refresh_activate(self, *extra):
         self.refresh_comparison()