Mercurial > vim

changeset 30616:eb86a6330ae3 v9.0.0643

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0643: smoothscroll test fails Commit: https://github.com/vim/vim/commit/b34c4b7863af8718ad726173585dd38a7c292f0f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Oct 2 22:32:08 2022 +0100 patch 9.0.0643: smoothscroll test fails Problem: Smoothscroll test fails. Solution: Check if skipcol changed.
author Bram Moolenaar <Bram@vim.org>
date Sun, 02 Oct 2022 23:45:03 +0200
parents fb8566e27f58
children a8e000dc6bf9
files src/normal.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/normal.c
+++ b/src/normal.c
@@ -2470,6 +2470,7 @@ nv_scroll_line(cmdarg_T *cap)
 scroll_redraw(int up, long count)
 {
     linenr_T	prev_topline = curwin->w_topline;
+    int		prev_skipcol = curwin->w_skipcol;
 #ifdef FEAT_DIFF
     int		prev_topfill = curwin->w_topfill;
 #endif
@@ -2491,6 +2492,7 @@ scroll_redraw(int up, long count)
 	// we get stuck at one position.  Don't move the cursor up if the
 	// first line of the buffer is already on the screen
 	while (curwin->w_topline == prev_topline
+		&& curwin->w_skipcol == prev_skipcol
 #ifdef FEAT_DIFF
 		&& curwin->w_topfill == prev_topfill
 #endif
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    643,
+/**/
     642,
 /**/
     641,