From 0e6828dc01877084fcfcf87ef2721fc01c2c73fa Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 8 Dec 2011 10:13:16 +1100 Subject: [PATCH] Stuff from months ago that I forget why But it looks ok Signed-off-by: NeilBrown --- TODO | 9 +++++++++ vpatch.c | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index ba63439..285929c 100644 --- 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 e5aa4e8..256d9c4 100644 --- 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, "-"); -- 2.39.5