[meld: 53/63] filediff, meldbuffer: Use detected newlines from the source file

[Kai Willadsen <kaiw src gnome org>]

commit 2f2184fd7bfb3042aed2847c84e2e9034afea43f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 11 07:50:26 2015 +1000

    filediff, meldbuffer: Use detected newlines from the source file

 meld/filediff.py   |    3 +--
 meld/meldbuffer.py |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index f183857..ac89a22 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -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:
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index e122a28..a6b42fd 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -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()