Stuff from months ago that I forget why

But it looks ok

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/TODO b/TODO
index ba6343902ebe0428cc4372f8c617517a0283336d..285929c2be2d5df663ff9e56deca796df2052c4e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,12 @@
+- search show go to right column and highlight
+- do we always recenter top when we split - what if near but not at bottom
+- side-by-side sometimes shows last line of a chunk with
+  the next chunk
+- '|' should go from sidebyside to merge
+- sometimes the split page gets white spaces - 'int bl_count'
+- use next_mline in print_merge2
++ discard merge.c
+
 
 - extract.c should be able to extract half of a word-diff
 - extract.c should work on word-merges

diff --git a/vpatch.c b/vpatch.c
index e5aa4e8dcc7b5ff9e01f25c8e4790163ddce3924..256d9c4e2c632da1e4c749e70068a5166d61ca00 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -326,7 +326,7 @@ static int same_mpos(struct mpos a, struct mpos b)
        return a.p.m == b.p.m &&
                a.p.s == b.p.s &&
                a.p.o == b.p.o &&
-               a.state == b.state;
+               (a.state == b.state || a.state == 0 || b.state == 0);
 }
 
 /* Check if a particular stream is meaningful in a particular merge
@@ -1321,7 +1321,6 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
                        while (!same_mpos(spos, tpos))
                                next_mline(&spos, fm, fb, fa, ci.merger, smode);
 
-
                        (void)attrset(a_sep);
                        for (i = 0; i < cols; i++)
                                mvaddstr(splitrow, i, "-");