Commit 2f2184fd authored by Kai Willadsen's avatar Kai Willadsen

filediff, meldbuffer: Use detected newlines from the source file

parent 93a30043
......@@ -1077,7 +1077,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
if success:
buf.data.encoding = loader.get_encoding()
buf.data.newlines = loader.get_newline_type()
start, end = buf.get_bounds()
buffer_text = buf.get_text(start, end, False)
......@@ -1330,7 +1329,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
active_filters = any([f.active for f in self.text_filters])
bufs = self.textbuffer[:self.num_panes]
newlines = [b.data.newlines for b in bufs]
newlines = [b.data.sourcefile.get_newline_type() for b in bufs]
different_newlines = not misc.all_same(newlines)
if active_filters:
......
......@@ -118,7 +118,6 @@ class MeldBufferData(GObject.GObject):
self.loaded = False
self.savefile = None
self.encoding = None
self.newlines = None
def __del__(self):
self._disconnect_monitor()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment