Skip to content

Ctrl-F and Ctrl-B at more prompt not working with key protocol #18558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+17 −1
Closed

Ctrl-F and Ctrl-B at more prompt not working with key protocol #18558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/misc1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,7 @@ get_keystroke(void)
int save_mapped_ctrl_c = mapped_ctrl_c;
int waited = 0;

mod_mask = 0;
mapped_ctrl_c = FALSE; // mappings are not used here
for (;;)
{
Expand Down Expand Up @@ -974,7 +975,7 @@ get_keystroke(void)
vim_free(buf);

mapped_ctrl_c = save_mapped_ctrl_c;
return n;
return merge_modifyOtherKeys(n, &mod_mask);
}

// For overflow detection, add a digit safely to an int value.
Expand Down
15 changes: 15 additions & 0 deletions src/testdir/test_messages.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ func Test_message_more()
CheckRunVimInTerminal

let buf = RunVimInTerminal('', {'rows': 6})
let chan = buf->term_getjob()->job_getchannel()
call term_sendkeys(buf, ":call setline(1, range(1, 100))\n")

call term_sendkeys(buf, ":%pfoo\<C-H>\<C-H>\<C-H>#")
Expand Down Expand Up @@ -272,6 +273,19 @@ func Test_message_more()
call term_sendkeys(buf, 'u')
call WaitForAssert({-> assert_equal(' 79 79', term_getline(buf, 5))})

" Test <C-F> and <C-B> with different keyboard protocols.
for [ctrl_f, ctrl_b] in [
\ [GetEscCodeCSI27('f', 5), GetEscCodeCSI27('b', 5)],
\ [GetEscCodeCSI27('F', 5), GetEscCodeCSI27('B', 5)],
\ [GetEscCodeCSIu('f', 5), GetEscCodeCSIu('b', 5)],
\ [GetEscCodeCSIu('F', 5), GetEscCodeCSIu('B', 5)],
\ ]
call ch_sendraw(chan, ctrl_f)
call WaitForAssert({-> assert_equal(' 84 84', term_getline(buf, 5))})
call ch_sendraw(chan, ctrl_b)
call WaitForAssert({-> assert_equal(' 79 79', term_getline(buf, 5))})
endfor

" Up all the way with 'g'.
call term_sendkeys(buf, 'g')
call WaitForAssert({-> assert_equal(' 4 4', term_getline(buf, 5))})
Expand All @@ -285,6 +299,7 @@ func Test_message_more()
call WaitForAssert({-> assert_equal('Press ENTER or type command to continue', term_getline(buf, 6))})
call term_sendkeys(buf, '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, "\<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))})
Expand Down
Loading