Description: fix handup when comparing certain files
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/786134
Origin: http://git.gnome.org/browse/meld/commit/?id=8c5a45f4308d05c74b2d54c4ca936b6f09fad5da
Applied-Upstream: 1.5.2

Index: meld/meld/filediff.py
===================================================================
--- meld.orig/meld/filediff.py	2011-08-22 13:18:55.963064767 +0200
+++ meld/meld/filediff.py	2011-08-22 13:18:56.693064771 +0200
@@ -897,7 +897,7 @@
                         nextbit = "\r" + nextbit
                         t.was_cr = False
                     if len(nextbit):
-                        if (nextbit[-1] == "\r"):
+                        if nextbit[-1] == "\r" and len(nextbit) > 1:
                             t.was_cr = True
                             nextbit = nextbit[0:-1]
                         t.buf.insert( t.buf.get_end_iter(), nextbit )