diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-30 19:10:06 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-30 19:10:06 +0100 |
commit | 6747cf1671bd41cddee77c65b3f9a70509f968db (patch) | |
tree | d0d033e5b99251dfd408f8d0463727191b0e370a /src | |
parent | f39cfb72629f3e7fefaf578a3faa2619cd0654f8 (diff) |
patch 9.0.0115: when 'cmdheight' is zero pressing ':' may scroll a windowv9.0.0115
Problem: When 'cmdheight' is zero pressing ':' may scroll a window.
Solution: Add the made_cmdheight_nonzero flag and set 'scrolloff' to zero.
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_getln.c | 13 | ||||
-rw-r--r-- | src/globals.h | 3 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 3 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 58c83a85c7..6c2a3a4b44 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1615,10 +1615,17 @@ getcmdline_int( if (cmdheight0) { - // If cmdheight is 0, cmdheight must be set to 1 when we enter command - // line. + int save_so = lastwin->w_p_so; + + // If cmdheight is 0, cmdheight must be set to 1 when we enter the + // command line. Set "made_cmdheight_nonzero" and reset 'scrolloff' to + // avoid scrolling the last window. + made_cmdheight_nonzero = TRUE; + lastwin->w_p_so = 0; set_option_value((char_u *)"ch", 1L, NULL, 0); update_screen(VALID); // redraw the screen NOW + made_cmdheight_nonzero = FALSE; + lastwin->w_p_so = save_so; } // one recursion level deeper @@ -2606,9 +2613,11 @@ theend: if (cmdheight0) { + made_cmdheight_nonzero = TRUE; set_option_value((char_u *)"ch", 0L, NULL, 0); // Redraw is needed for command line completion redraw_all_later(CLEAR); + made_cmdheight_nonzero = FALSE; } --depth; diff --git a/src/globals.h b/src/globals.h index 786c850d3c..86472acda3 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1728,3 +1728,6 @@ EXTERN int channel_need_redraw INIT(= FALSE); // While executing a regexp and set to OPTION_MAGIC_ON or OPTION_MAGIC_OFF this // overrules p_magic. Otherwise set to OPTION_MAGIC_NOT_SET. EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET); + +// Set when 'cmdheight' is changed from non-zero to one temporarily. +EXTERN int made_cmdheight_nonzero INIT(= FALSE); diff --git a/src/version.c b/src/version.c index ccfc04861c..796b88f0f9 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 115, +/**/ 114, /**/ 113, diff --git a/src/window.c b/src/window.c index 15a4d505e4..e418f11598 100644 --- a/src/window.c +++ b/src/window.c @@ -6365,7 +6365,8 @@ win_new_height(win_T *wp, int height) // There is no point in adjusting the scroll position when exiting. Some // values might be invalid. - if (!exiting) + // Skip scroll_to_fraction() when 'cmdheight' was set to one from zero. + if (!exiting && !made_cmdheight_nonzero) scroll_to_fraction(wp, prev_height); } |