From 193f4fb6890c3d8b6865e927d19c2c0ed5b9e2d0 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 15 Nov 2012 13:46:33 +1100 Subject: [PATCH] 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 --- vpatch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vpatch.c b/vpatch.c index 9adfa0d..e7e37f9 100644 --- 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); -- 2.39.5