vpatch: make sure render is stable when the merge is changed.

If we are in the main window and pos suddenly is not 'visible',
we need to jump to the new, visible, pos.

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

diff --git a/vpatch.c b/vpatch.c
index 9adfa0d2c7ec3eb6c7334c22eef9f387e9cc55e7..e7e37f9ff8d51fb75c31bf05fac42a7766256ce7 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -1475,7 +1475,8 @@ static int merge_window(struct plist *p, FILE *f, int reverse)
 
                if (visible(mode, ci.merger, &vispos) < 0)
                        prev_mline(&vispos, fm, fb, fa, ci.merger, mode);
-
+               if (!curs.alt)
+                       pos= vispos;
        retry:
                draw_mline(mode, row, start, cols, fm, fb, fa, ci.merger,
                           vispos, (splitrow >= 0 && curs.alt) ? NULL : &curs);