Skip to content

Commit fdfe754

Browse files
committed
filediff: Reuse buffer encodings on revert use
1 parent bab6479 commit fdfe754

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

meld/filediff.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,9 +1698,10 @@ def on_revert_activate(self, *extra):
16981698
dialog.widget.destroy()
16991699

17001700
if response == Gtk.ResponseType.OK:
1701-
gfiles = [b.data.gfile for b in self.textbuffer[:self.num_panes]]
1702-
# TODO: Make sure to reuse file encodings if present
1703-
self.set_files(gfiles)
1701+
buffers = self.textbuffer[:self.num_panes]
1702+
gfiles = [b.data.gfile for b in buffers]
1703+
encodings = [b.data.encoding for b in buffers]
1704+
self.set_files(gfiles, encodings=encodings)
17041705

17051706
def on_refresh_activate(self, *extra):
17061707
self.refresh_comparison()

0 commit comments

Comments
 (0)