To: vim_dev@googlegroups.com
Subject: Patch 9.0.1564
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1564
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)
Files:      src/move.c, src/testdir/dumps/Test_smooth_wrap_2.dump,
            src/testdir/dumps/Test_smooth_wrap_4.dump


*** ../vim-9.0.1563/src/move.c	2023-05-15 18:17:20.282336344 +0100
--- src/move.c	2023-05-18 13:19:23.300737041 +0100
***************
*** 312,318 ****
  	*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
--- 312,317 ----
***************
*** 517,524 ****
  	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)
  	    reset_skipcol();
  
  	// May need to set w_skipcol when cursor in w_topline.
--- 516,523 ----
  	dollar_vcol = -1;
  	redraw_later(UPD_VALID);
  
! 	// 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.
*** ../vim-9.0.1563/src/testdir/dumps/Test_smooth_wrap_2.dump	2022-10-06 14:57:29.651338532 +0100
--- src/testdir/dumps/Test_smooth_wrap_2.dump	2023-05-18 13:19:23.300737041 +0100
***************
*** 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| 
  |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|%| 
--- 1,8 ----
! |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
! |@+0#4040ff13&@2| @36
! | +0#0000000&@21|4|,|1| @10|4|0|%| 
*** ../vim-9.0.1563/src/testdir/dumps/Test_smooth_wrap_4.dump	2022-10-06 14:57:29.651338532 +0100
--- src/testdir/dumps/Test_smooth_wrap_4.dump	2023-05-18 13:19:23.300737041 +0100
***************
*** 2,8 ****
  |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| 
  |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|7|,|1| @10|B|o|t| 
--- 2,8 ----
  |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| 
  |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|7|,|1| @10|B|o|t| 
*** ../vim-9.0.1563/src/version.c	2023-05-16 22:15:46.799403409 +0100
--- src/version.c	2023-05-18 13:23:32.154059687 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1564,
  /**/

-- 
Never overestimate a man's ability to underestimate a woman.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///