0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 9.0.0340: the 'cmdheight' zero support causes too much trouble

Problem:    The 'cmdheight' zero support causes too much trouble.
Solution:   Revert support for 'cmdheight' being zero.
This commit is contained in:
Bram Moolenaar
2022-08-31 14:46:18 +01:00
parent a63ad78ed3
commit a2a8973e51
32 changed files with 46 additions and 404 deletions

View File

@@ -1591,25 +1591,6 @@ getcmdline_int(
int did_save_ccline = FALSE;
int cmdline_type;
int wild_type;
int cmdheight0 = p_ch == 0;
if (cmdheight0)
{
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);
#ifdef HAS_MESSAGE_WINDOW
popup_hide_message_win();
#endif
update_screen(UPD_VALID); // redraw the screen NOW
made_cmdheight_nonzero = FALSE;
lastwin->w_p_so = save_so;
}
// one recursion level deeper
++depth;
@@ -2577,15 +2558,6 @@ theend:
{
char_u *p = ccline.cmdbuff;
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(UPD_NOT_VALID);
made_cmdheight_nonzero = FALSE;
}
--depth;
if (did_save_ccline)
restore_cmdline(&save_ccline);