diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-28 22:46:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-28 22:46:21 +0100 |
| commit | b849c82851192cf14cd92b78d83d90ca432332ea (patch) | |
| tree | 7a7dd5713edd0126e765676cc13dc1250359ba72 | |
| parent | 7a99da43d14671cc91a302bcfa34d37a35eaa28d (diff) | |
| download | vim-git-b849c82851192cf14cd92b78d83d90ca432332ea.tar.gz | |
patch 9.0.0310: output of :messages dissappears when cmdheight is zerov9.0.0310
Problem: Output of :messages dissappears when cmdheight is zero.
Solution: Do not use the messages window for :messages. Make Esc close the
messages window.
| -rw-r--r-- | src/message.c | 1 | ||||
| -rw-r--r-- | src/normal.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c index 096f274dd..e4f8af11a 100644 --- a/src/message.c +++ b/src/message.c @@ -1077,6 +1077,7 @@ ex_messages(exarg_T *eap) } msg_hist_off = TRUE; + dont_use_message_window(); p = first_msg_hist; if (eap->addr_count != 0) diff --git a/src/normal.c b/src/normal.c index 6fcdaeb78..12b611e17 100644 --- a/src/normal.c +++ b/src/normal.c @@ -6820,7 +6820,14 @@ nv_esc(cmdarg_T *cap) redraw_curbuf_later(UPD_INVERTED); } else if (no_reason) - vim_beep(BO_ESC); + { +#ifdef HAS_MESSAGE_WINDOW + if (popup_message_win_visible()) + popup_hide_message_win(); + else +#endif + vim_beep(BO_ESC); + } clearop(cap->oap); // A CTRL-C is often used at the start of a menu. When 'insertmode' is diff --git a/src/version.c b/src/version.c index c69e46c49..d8a68626c 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 310, +/**/ 309, /**/ 308, |