[meld] gutterrendererchunk: Make insert chunk action consistent in delete mode



commit 0bf16976a96ca491c99baa3e658f44ede2fa9960
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Oct 3 07:13:33 2016 +1000

    gutterrendererchunk: Make insert chunk action consistent in delete mode
    
    Replace chunks remove their action if we're in delete mode and the
    current chunk can't be deleted. This change just makes insert actions
    do the same thing.

 meld/gutterrendererchunk.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py
index 4970265..863c756 100644
--- a/meld/gutterrendererchunk.py
+++ b/meld/gutterrendererchunk.py
@@ -260,7 +260,7 @@ class GutterRendererChunkAction(
         if change_type == "delete":
             if (editable and (self.mode == MODE_DELETE or not other_editable)):
                 action = MODE_DELETE
-            elif other_editable:
+            elif other_editable and self.mode != MODE_DELETE:
                 action = MODE_REPLACE
         elif change_type == "replace":
             if not editable:


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