From 0222c2d103ad9298bec4dc8864cd80b4e7559db1 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Thu, 18 May 2023 13:26:57 +0100 Subject: [PATCH] patch 9.0.1564: display moves up and down with 'incsearch' and 'smoothscroll' Problem: Display moves up and down with 'incsearch' and 'smoothscroll'. Solution: Do not check if w_skipcol changed. (Luuk van Baal, closes #12410, closes #12409) --- src/move.c | 5 ++--- src/testdir/dumps/Test_smooth_wrap_2.dump | 6 +++--- src/testdir/dumps/Test_smooth_wrap_4.dump | 4 ++-- src/version.c | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/move.c b/src/move.c index 93c101b79..3f6802ac7 100644 --- a/src/move.c +++ b/src/move.c @@ -312,7 +312,6 @@ update_topline(void) *so_ptr = mouse_dragging - 1; linenr_T old_topline = curwin->w_topline; - colnr_T old_skipcol = curwin->w_skipcol; #ifdef FEAT_DIFF int old_topfill = curwin->w_topfill; #endif @@ -517,8 +516,8 @@ update_topline(void) dollar_vcol = -1; redraw_later(UPD_VALID); - // Only reset w_skipcol if it was not just set to make cursor visible. - if (curwin->w_skipcol == old_skipcol) + // When 'smoothscroll' is not set, should reset w_skipcol. + if (!curwin->w_p_sms) reset_skipcol(); // May need to set w_skipcol when cursor in w_topline. diff --git a/src/testdir/dumps/Test_smooth_wrap_2.dump b/src/testdir/dumps/Test_smooth_wrap_2.dump index 65a357dbb..fb0a981a8 100644 --- a/src/testdir/dumps/Test_smooth_wrap_2.dump +++ b/src/testdir/dumps/Test_smooth_wrap_2.dump @@ -1,8 +1,8 @@ -|<+0#4040ff13#ffffff0@2|h+0#0000000&| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 -|L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| +|L+0&#ffffff0|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 >L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 -@22|4|,|1| @10|2|5|%| +|@+0#4040ff13&@2| @36 +| +0#0000000&@21|4|,|1| @10|4|0|%| diff --git a/src/testdir/dumps/Test_smooth_wrap_4.dump b/src/testdir/dumps/Test_smooth_wrap_4.dump index c23f494dc..1c42f64f4 100644 --- a/src/testdir/dumps/Test_smooth_wrap_4.dump +++ b/src/testdir/dumps/Test_smooth_wrap_4.dump @@ -2,7 +2,7 @@ |L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 ->L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| +|L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| -|w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 +>w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10 @22|7|,|1| @10|B|o|t| diff --git a/src/version.c b/src/version.c index 0e1e32616..6cf7de948 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1564, /**/ 1563, /**/