mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-05 13:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1849: CTRL-F and CTRL-B don't work in more prompt

Browse Source 
Problem:  CTRL-F and CTRL-B don't work in more prompt
Solution: Make CTRL-F and CTRL-B scroll by a screen down/up
          (Bjoern Foersterling)

closes: vim/vim#18545

fcf4c435af

Co-authored-by: bfoersterling <bjoern.foersterling@gmail.com>
This commit is contained in:
zeertzjq
2025-10-12 22:30:29 +08:00
parent d590644620
commit 92b834fc7a
4 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
runtime/doc/message.txt
View File

@@ -810,26 +810,27 @@ This message is given when the screen is filled with messages. It is only
given when the 'more' option is on. It is highlighted with the |hl-MoreMsg| given when the 'more' option is on. It is highlighted with the |hl-MoreMsg|
group. group.
Type effect ~ Type effect ~
<CR> or <NL> or j or <Down> one more line <CR> or <NL> or j or <Down> one more line
d down a page (half a screen) d down a page (half a screen)
<Space> or f or <PageDown> down a screen <Space> or f or <PageDown> or CTRL-F down a screen
G down all the way, until the hit-enter G down all the way, until the
prompt hit-enter prompt
<BS> or k or <Up> one line back <BS> or k or <Up> one line back
u up a page (half a screen) u up a page (half a screen)
b or <PageUp> back a screen b or <PageUp> or CTRL-B back a screen
g back to the start g back to the start
q, <Esc> or CTRL-C stop the listing q, <Esc> or CTRL-C stop the listing
: stop the listing and enter a : stop the listing and enter a
command-line command-line
<C-Y> yank (copy) a modeless selection to <C-Y> yank (copy) a modeless
the clipboard ("* and "+ registers) selection to the clipboard
{menu-entry} what the menu is defined to in ("* and "+ registers)
Cmdline-mode. {menu-entry} what the menu is defined to
<LeftMouse> next page* in Cmdline-mode.
<LeftMouse> next page*
Any other key causes the meaning of the keys to be displayed. Any other key causes the meaning of the keys to be displayed.

6
src/nvim/message.c
View File

@@ -1447,7 +1447,7 @@ void wait_return(int redraw)
// to avoid that typing one 'j' too many makes the messages // to avoid that typing one 'j' too many makes the messages
// disappear. // disappear.
if (p_more) { if (p_more) {
if (c == 'b' || c == 'k' || c == 'u' || c == 'g' if (c == 'b' || c == Ctrl_B || c == 'k' || c == 'u' || c == 'g'
|| c == K_UP || c == K_PAGEUP) { || c == K_UP || c == K_PAGEUP) {
if (msg_scrolled > Rows) { if (msg_scrolled > Rows) {
// scroll back to show older messages // scroll back to show older messages
@@ -1466,7 +1466,7 @@ void wait_return(int redraw)
hit_return_msg(false); hit_return_msg(false);
} }
} else if (msg_scrolled > Rows - 2 } else if (msg_scrolled > Rows - 2
&& (c == 'j' || c == 'd' || c == 'f' && (c == 'j' || c == 'd' || c == 'f' || c == Ctrl_F
|| c == K_DOWN || c == K_PAGEDOWN)) { || c == K_DOWN || c == K_PAGEDOWN)) {
c = K_IGNORE; c = K_IGNORE;
} }
@@ -2993,12 +2993,14 @@ static bool do_more_prompt(int typed_char)
break; break;
case 'b': // one page back case 'b': // one page back
case Ctrl_B:
case K_PAGEUP: case K_PAGEUP:
toscroll = -(Rows - 1); toscroll = -(Rows - 1);
break; break;
case ' ': // one extra page case ' ': // one extra page
case 'f': case 'f':
case Ctrl_F:
case K_PAGEDOWN: case K_PAGEDOWN:
case K_LEFTMOUSE: case K_LEFTMOUSE:
toscroll = Rows - 1; toscroll = Rows - 1;

52
test/functional/legacy/messages_spec.lua
View File

@@ -192,7 +192,7 @@ describe('messages', function()
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
-- Down a screen with <Space>, f, or <PageDown>. -- Down a screen with <Space>, f, <C-F>, or <PageDown>.
feed('f') feed('f')
screen:expect([[ screen:expect([[
{8: 10 }10 | {8: 10 }10 |
@@ -202,7 +202,7 @@ describe('messages', function()
{8: 14 }14 | {8: 14 }14 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
feed('<Space>') feed('\6')
screen:expect([[ screen:expect([[
{8: 15 }15 | {8: 15 }15 |
{8: 16 }16 | {8: 16 }16 |
@@ -211,7 +211,7 @@ describe('messages', function()
{8: 19 }19 | {8: 19 }19 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
feed('<PageDown>') feed(' ')
screen:expect([[ screen:expect([[
{8: 20 }20 | {8: 20 }20 |
{8: 21 }21 | {8: 21 }21 |
@@ -220,15 +220,24 @@ describe('messages', function()
{8: 24 }24 | {8: 24 }24 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
feed('<PageDown>')
screen:expect([[
{8: 25 }25 |
{8: 26 }26 |
{8: 27 }27 |
{8: 28 }28 |
{8: 29 }29 |
{6:-- More --}^ |
]])
-- Down a page (half a screen) with d. -- Down a page (half a screen) with d.
feed('d') feed('d')
screen:expect([[ screen:expect([[
{8: 23 }23 | {8: 28 }28 |
{8: 24 }24 | {8: 29 }29 |
{8: 25 }25 | {8: 30 }30 |
{8: 26 }26 | {8: 31 }31 |
{8: 27 }27 | {8: 32 }32 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
@@ -272,7 +281,7 @@ describe('messages', function()
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
-- Up a screen with b or <PageUp>. -- Up a screen with b, <C-B> or <PageUp>.
feed('b') feed('b')
screen:expect([[ screen:expect([[
{8: 88 }88 | {8: 88 }88 |
@@ -282,7 +291,7 @@ describe('messages', function()
{8: 92 }92 | {8: 92 }92 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
feed('<PageUp>') feed('\2')
screen:expect([[ screen:expect([[
{8: 83 }83 | {8: 83 }83 |
{8: 84 }84 | {8: 84 }84 |
@@ -291,15 +300,24 @@ describe('messages', function()
{8: 87 }87 | {8: 87 }87 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
feed('<PageUp>')
screen:expect([[
{8: 78 }78 |
{8: 79 }79 |
{8: 80 }80 |
{8: 81 }81 |
{8: 82 }82 |
{6:-- More --}^ |
]])
-- Up a page (half a screen) with u. -- Up a page (half a screen) with u.
feed('u') feed('u')
screen:expect([[ screen:expect([[
{8: 80 }80 | {8: 75 }75 |
{8: 81 }81 | {8: 76 }76 |
{8: 82 }82 | {8: 77 }77 |
{8: 83 }83 | {8: 78 }78 |
{8: 84 }84 | {8: 79 }79 |
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
@@ -314,7 +332,7 @@ describe('messages', function()
{6:-- More --}^ | {6:-- More --}^ |
]]) ]])
-- All the way down. Pressing f should do nothing but pressing -- All the way down. Pressing f or CTRL-F should do nothing but pressing
-- space should end the more prompt. -- space should end the more prompt.
feed('G') feed('G')
screen:expect([[ screen:expect([[
@@ -327,6 +345,8 @@ describe('messages', function()
]]) ]])
feed('f') feed('f')
screen:expect_unchanged() screen:expect_unchanged()
feed('<C-F>')
screen:expect_unchanged()
feed('<Space>') feed('<Space>')
screen:expect([[ screen:expect([[
96 | 96 |

28
test/old/testdir/test_messages.vim
View File

@@ -241,18 +241,20 @@ func Test_message_more()
call term_sendkeys(buf, "\<Down>") call term_sendkeys(buf, "\<Down>")
call WaitForAssert({-> assert_equal(' 9 9', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 9 9', term_getline(buf, 5))})
" Down a screen with <Space>, f, or <PageDown>. " Down a screen with <Space>, f, <C-F> or <PageDown>.
call term_sendkeys(buf, 'f') call term_sendkeys(buf, 'f')
call WaitForAssert({-> assert_equal(' 14 14', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 14 14', term_getline(buf, 5))})
call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))}) call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))})
call term_sendkeys(buf, ' ') call term_sendkeys(buf, "\<C-F>")
call WaitForAssert({-> assert_equal(' 19 19', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 19 19', term_getline(buf, 5))})
call term_sendkeys(buf, "\<PageDown>") call term_sendkeys(buf, ' ')
call WaitForAssert({-> assert_equal(' 24 24', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 24 24', term_getline(buf, 5))})
call term_sendkeys(buf, "\<PageDown>")
call WaitForAssert({-> assert_equal(' 29 29', term_getline(buf, 5))})
" Down a page (half a screen) with d. " Down a page (half a screen) with d.
call term_sendkeys(buf, 'd') call term_sendkeys(buf, 'd')
call WaitForAssert({-> assert_equal(' 27 27', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 32 32', term_getline(buf, 5))})
" Down all the way with 'G'. " Down all the way with 'G'.
call term_sendkeys(buf, 'G') call term_sendkeys(buf, 'G')
@@ -267,15 +269,17 @@ func Test_message_more()
call term_sendkeys(buf, "\<Up>") call term_sendkeys(buf, "\<Up>")
call WaitForAssert({-> assert_equal(' 97 97', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 97 97', term_getline(buf, 5))})
" Up a screen with b or <PageUp>. " Up a screen with b, <C-B> or <PageUp>.
call term_sendkeys(buf, 'b') call term_sendkeys(buf, 'b')
call WaitForAssert({-> assert_equal(' 92 92', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 92 92', term_getline(buf, 5))})
call term_sendkeys(buf, "\<PageUp>") call term_sendkeys(buf, "\<C-B>")
call WaitForAssert({-> assert_equal(' 87 87', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 87 87', term_getline(buf, 5))})
call term_sendkeys(buf, "\<PageUp>")
call WaitForAssert({-> assert_equal(' 82 82', term_getline(buf, 5))})
" Up a page (half a screen) with u. " Up a page (half a screen) with u.
call term_sendkeys(buf, 'u') call term_sendkeys(buf, 'u')
call WaitForAssert({-> assert_equal(' 84 84', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal(' 79 79', term_getline(buf, 5))})
" Up all the way with 'g'. " Up all the way with 'g'.
call term_sendkeys(buf, 'g') call term_sendkeys(buf, 'g')
@@ -283,13 +287,16 @@ func Test_message_more()
call WaitForAssert({-> assert_equal(':%p#', term_getline(buf, 1))}) call WaitForAssert({-> assert_equal(':%p#', term_getline(buf, 1))})
call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))}) call WaitForAssert({-> assert_equal('-- More --', term_getline(buf, 6))})
" All the way down. Pressing f should do nothing but pressing " All the way down. Pressing f or Ctrl-F should do nothing but pressing
" space should end the more prompt. " space should end the more prompt.
call term_sendkeys(buf, 'G') call term_sendkeys(buf, 'G')
call WaitForAssert({-> assert_equal('100 100', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal('100 100', term_getline(buf, 5))})
call WaitForAssert({-> assert_equal('Press ENTER or type command to continue', term_getline(buf, 6))}) call WaitForAssert({-> assert_equal('Press ENTER or type command to continue', term_getline(buf, 6))})
call term_sendkeys(buf, 'f') call term_sendkeys(buf, 'f')
call WaitForAssert({-> assert_equal('100 100', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal('100 100', term_getline(buf, 5))})
call term_sendkeys(buf, "\<C-F>")
call WaitForAssert({-> assert_equal('100 100', term_getline(buf, 5))})
call WaitForAssert({-> assert_equal('Press ENTER or type command to continue', term_getline(buf, 6))})
call term_sendkeys(buf, ' ') call term_sendkeys(buf, ' ')
call WaitForAssert({-> assert_equal('100', term_getline(buf, 5))}) call WaitForAssert({-> assert_equal('100', term_getline(buf, 5))})
@@ -347,6 +354,11 @@ func Test_message_more_scrollback()
call term_sendkeys(buf, 'b') call term_sendkeys(buf, 'b')
call VerifyScreenDump(buf, 'Test_more_scrollback_2', {}) call VerifyScreenDump(buf, 'Test_more_scrollback_2', {})
call term_sendkeys(buf, "\<C-F>")
call TermWait(buf)
call term_sendkeys(buf, "\<C-B>")
call VerifyScreenDump(buf, 'Test_more_scrollback_2', {})
call term_sendkeys(buf, 'q') call term_sendkeys(buf, 'q')
call TermWait(buf) call TermWait(buf)
call StopVimInTerminal(buf) call StopVimInTerminal(buf)