mergeview: adding merge to region needs full-lines in region

If the region isn't whole lines, make it so.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 71a0b7cc48f332a46740b6e0a261c6bf3d401ca2..83deb315787f8d38f1eecc53d5f9bfc6c9ef54fd 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -21,7 +21,7 @@ the file.
       flags them?
 - [ ] merge command 9-A-m could work as one command.  If there is an
       active selection, the patch is moved to that selection.
-- [ ] merge command 9 must ensure selection is full lines.
+- [X] merge command 9 must ensure selection is full lines.
 - [ ] if cursor position causes pane size to change, this doesn't
       propagate.
 - [ ] When is left_margin used?  Can I use it for hanging indent?  If

diff --git a/python/lib-mergeview.py b/python/lib-mergeview.py
index b8a6d59ab5fa29768f7a19cdf9f773877d521e27..d66fb35f585d80cb4d9a18e04587968eafa7aa8b 100644 (file)
--- a/python/lib-mergeview.py
+++ b/python/lib-mergeview.py
@@ -161,6 +161,9 @@ class MergePane(edlib.Pane):
             else:
                 mk = None
             if mk:
+                # selection must be full lines
+                focus.call("doc:EOL", -1, pt)
+                focus.call("doc:EOL", -1, mk)
                 strt,end = pt.dup(),mk.dup()
                 if strt > end:
                     strt,end = end,strt