From b59494cab15310c8e2aaf59d48b270282c3e2017 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 19 Mar 2013 13:56:08 +0100 Subject: 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) --- src/message.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/message.c') diff --git a/src/message.c b/src/message.c index f5d17146a9..8909f081f2 100644 --- a/src/message.c +++ b/src/message.c @@ -976,10 +976,22 @@ wait_return(redraw) */ 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 @@ wait_return(redraw) } } 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) -- cgit v1.2.3