diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-08 10:36:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-08 10:36:41 +0800 |
| commit | 73ae7d44a281a543f902f0dea111713c06490079 (patch) | |
| tree | 4acf12ecea65c77cc3734b7f4faf1d33dcdc32dc /src | |
| parent | 76b91106fc836ae634cdf8425d121d843d14d70a (diff) | |
| download | rneovim-73ae7d44a281a543f902f0dea111713c06490079.tar.gz rneovim-73ae7d44a281a543f902f0dea111713c06490079.tar.bz2 rneovim-73ae7d44a281a543f902f0dea111713c06490079.zip | |
fix(quickfix): make shortmess+=O work with cmdheight=0 (#29609)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/globals.h | 3 | ||||
| -rw-r--r-- | src/nvim/quickfix.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 410e8f2e7c..3e83911e86 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -146,8 +146,7 @@ EXTERN hlf_T edit_submode_highl; // highl. method for extra info EXTERN bool cmdmsg_rl INIT( = false); // cmdline is drawn right to left EXTERN int msg_col; EXTERN int msg_row; -EXTERN int msg_scrolled; // Number of screen lines that windows have - // scrolled because of printing messages. +EXTERN int msg_scrolled; ///< Number of screen lines that messages have scrolled. // when true don't set need_wait_return in msg_puts_attr() // when msg_scrolled is non-zero EXTERN bool msg_scrolled_ign INIT( = false); diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index ed3fd83fd5..21662264bc 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -2915,8 +2915,7 @@ static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr, buf { garray_T *const gap = qfga_get(); - // Update the screen before showing the message, unless the screen - // scrolled up. + // Update the screen before showing the message, unless messages scrolled. if (!msg_scrolled) { update_topline(curwin); if (must_redraw) { @@ -2938,7 +2937,8 @@ static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr, buf linenr_T i = msg_scroll; if (curbuf == old_curbuf && curwin->w_cursor.lnum == old_lnum) { msg_scroll = true; - } else if (!msg_scrolled && shortmess(SHM_OVERALL)) { + } else if ((msg_scrolled == 0 || (p_ch == 0 && msg_scrolled == 1)) + && shortmess(SHM_OVERALL)) { msg_scroll = false; } msg_ext_set_kind("quickfix"); |