thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1564: display moves up and down with 'incsearch' and 'smoothscroll'

Browse Source 
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)
This commit is contained in:
Luuk van Baal
2023-05-18 13:26:57 +01:00
committed by Bram Moolenaar
parent c0da540466
commit 0222c2d103
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/move.c
View File

@@ -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.

6
src/testdir/dumps/Test_smooth_wrap_2.dump
View File

@@ -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|%|

4
src/testdir/dumps/Test_smooth_wrap_4.dump
View File

@@ -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|

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1564,
/**/
1563,
/**/