[meld] Don't draw oblique 'copy' arrows for insert chunks (closes bgo#589588)



commit 04cdfc0cf34fd8df6d3d8bdd27ac175311107c73
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jun 25 13:59:08 2010 +1000

    Don't draw oblique 'copy' arrows for insert chunks (closes bgo#589588)

 meld/filediff.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 53ea44c..12c1d6f 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1267,7 +1267,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         if self.keymask & MASK_SHIFT:
             pix0 = self.pixbuf_delete
             pix1 = self.pixbuf_delete
-        elif self.keymask & MASK_CTRL:
+        elif self.keymask & MASK_CTRL and \
+             change[0] not in ('insert', 'delete'):
             pix0 = self.pixbuf_copy0
             pix1 = self.pixbuf_copy1
         else: # self.keymask == 0:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]