updated for version 7.3.868
Problem: When at the hit-return prompt and using "k" while no text has
scrolled off screen, then using "j", an empty line is displayed.
Solution: Only act on "k" when text scrolled off screen. Also accept
page-up and page-down. (cptstubing)
diff --git a/src/message.c b/src/message.c
index f5d1714..8909f08 100644
--- a/src/message.c
+++ b/src/message.c
@@ -976,10 +976,22 @@
*/
if (p_more && !p_cp)
{
- if (c == 'b' || c == 'k' || c == 'u' || c == 'g' || c == K_UP)
+ if (c == 'b' || c == 'k' || c == 'u' || c == 'g'
+ || c == K_UP || c == K_PAGEUP)
{
- /* scroll back to show older messages */
- do_more_prompt(c);
+ if (msg_scrolled > Rows)
+ /* scroll back to show older messages */
+ do_more_prompt(c);
+ else
+ {
+ msg_didout = FALSE;
+ c = K_IGNORE;
+ msg_col =
+#ifdef FEAT_RIGHTLEFT
+ cmdmsg_rl ? Columns - 1 :
+#endif
+ 0;
+ }
if (quit_more)
{
c = CAR; /* just pretend CR was hit */
@@ -993,7 +1005,8 @@
}
}
else if (msg_scrolled > Rows - 2
- && (c == 'j' || c == K_DOWN || c == 'd' || c == 'f'))
+ && (c == 'j' || c == 'd' || c == 'f'
+ || c == K_DOWN || c == K_PAGEDOWN))
c = K_IGNORE;
}
} while ((had_got_int && c == Ctrl_C)
diff --git a/src/version.c b/src/version.c
index 70a0437..165b8e2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 868,
+/**/
867,
/**/
866,