mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pager): handle consecutive newlines properly (#27913)

Browse Source
This commit is contained in:
zeertzjq
2024-03-18 22:25:55 +08:00
committed by GitHub
parent 5de0482d1a
commit e3bd04f2af
3 changed files with 189 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/message.c
View File

@@ -1191,7 +1191,7 @@ void wait_return(int redraw)
check_timestamps(false);
}
hit_return_msg();
hit_return_msg(true);
do {
// Remember "got_int", if it is set vgetc() probably returns a
@@ -1240,7 +1240,7 @@ void wait_return(int redraw)
got_int = false;
} else if (c != K_IGNORE) {
c = K_IGNORE;
hit_return_msg();
hit_return_msg(false);
}
} else if (msg_scrolled > Rows - 2
&& (c == 'j' || c == 'd' || c == 'f'
@@ -1313,14 +1313,19 @@ void wait_return(int redraw)
}
/// Write the hit-return prompt.
static void hit_return_msg(void)
///
/// @param newline_sb if starting a new line, add it to the scrollback.
static void hit_return_msg(bool newline_sb)
{
int save_p_more = p_more;
p_more = false; // don't want to see this message when scrolling back
if (!newline_sb) {
p_more = false;
}
if (msg_didout) { // start on a new line
msg_putchar('\n');
}
p_more = false; // don't want to see this message when scrolling back
msg_ext_set_kind("return_prompt");
if (got_int) {
msg_puts(_("Interrupt: "));
@@ -2968,7 +2973,7 @@ void repeat_message(void)
msg_col = 0;
msg_clr_eos();
}
hit_return_msg();
hit_return_msg(false);
msg_row = Rows - 1;
}
}