Little fix for the Side-By-Side Diff dialog.

Thu, 09 Mar 2017 17:56:06 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 09 Mar 2017 17:56:06 +0100
changeset 5596
4550d8e34765
parent 5595
1d4706f786d6
child 5597
3d88d53f8c2b

Little fix for the Side-By-Side Diff dialog.

UI/CompareDialog.py file | annotate | diff | comparison | revisions
diff -r 1d4706f786d6 -r 4550d8e34765 UI/CompareDialog.py
--- a/UI/CompareDialog.py	Thu Mar 09 17:42:44 2017 +0100
+++ b/UI/CompareDialog.py	Thu Mar 09 17:56:06 2017 +0100
@@ -73,12 +73,12 @@
             yield ('e', linenumberformat.format(ln1), l1,
                    linenumberformat.format(ln2), l2)
             continue
-        if ln2 == "" and l2 == "\n":
+        if ln2 == "" and l2 in ("\r\n", "\n", "\r"):
             yield ('d', linenumberformat.format(ln1), removeMarkers(l1),
-                   emptylineno, '\n')
+                   emptylineno, l2)
             continue
-        if ln1 == "" and l1 == "\n":
-            yield ('i', emptylineno, '\n',
+        if ln1 == "" and l1 in ("\r\n", "\n", "\r"):
+            yield ('i', emptylineno, l1,
                    linenumberformat.format(ln2), removeMarkers(l2))
             continue
         yield ('r', linenumberformat.format(ln1), l1,

eric ide

mercurial