diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-02 22:32:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-02 22:32:08 +0100 |
| commit | b34c4b7863af8718ad726173585dd38a7c292f0f (patch) | |
| tree | 0250d9b006b42b8dfedafe1ff861ec20218261d5 | |
| parent | 693729ae58bd30fc1a4c08042ebe9923b45f5763 (diff) | |
| download | vim-git-b34c4b7863af8718ad726173585dd38a7c292f0f.tar.gz | |
patch 9.0.0643: smoothscroll test failsv9.0.0643
Problem: Smoothscroll test fails.
Solution: Check if skipcol changed.
| -rw-r--r-- | src/normal.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/normal.c b/src/normal.c index 05397380c..773c667a8 100644 --- 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 diff --git a/src/version.c b/src/version.c index 786a866bf..a228d74d8 100644 --- 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, |