mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-10 03:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1693: Ctrl-Q not handled like Ctrl-V in replace mode (#24669)

Browse Source 
Problem: Ctrl-Q not handled like Ctrl-V in replace mode
Solution: Handle Ctrl-Q like Ctrl-V

closes: vim/vim#12686
closes: vim/vim#12684

2d63e4b3cc

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2023-08-12 06:41:23 +08:00
committed by GitHub
parent 8f9c5ee5ef
commit 8c5d81997e
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/normal.c
View File

@@ -4506,7 +4506,7 @@ static void nv_replace(cmdarg_T *cap)
} }
// get another character // get another character
if (cap->nchar == Ctrl_V) { if (cap->nchar == Ctrl_V || cap->nchar == Ctrl_Q) {
had_ctrl_v = Ctrl_V; had_ctrl_v = Ctrl_V;
cap->nchar = get_literal(false); cap->nchar = get_literal(false);
// Don't redo a multibyte character with CTRL-V. // Don't redo a multibyte character with CTRL-V.
@@ -4733,7 +4733,8 @@ static void nv_vreplace(cmdarg_T *cap)
if (!MODIFIABLE(curbuf)) { if (!MODIFIABLE(curbuf)) {
emsg(_(e_modifiable)); emsg(_(e_modifiable));
} else { } else {
if (cap->extra_char == Ctrl_V) { // get another character if (cap->extra_char == Ctrl_V || cap->extra_char == Ctrl_Q) {
// get another character
cap->extra_char = get_literal(false); cap->extra_char = get_literal(false);
} }
if (cap->extra_char < ' ') { if (cap->extra_char < ' ') {

38
test/old/testdir/test_normal.vim
View File

@@ -4011,4 +4011,42 @@ func Test_normal_j_below_botline()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
" Test for r (replace) command with CTRL_V and CTRL_Q
func Test_normal_r_ctrl_v_cmd()
new
call append(0, 'This is a simple test: abcd')
exe "norm! 1gg$r\<C-V>\<C-V>"
call assert_equal(['This is a simple test: abc', ''], getline(1,'$'))
exe "norm! 1gg$hr\<C-Q>\<C-Q>"
call assert_equal(['This is a simple test: ab', ''], getline(1,'$'))
exe "norm! 1gg$2hr\<C-V>x7e"
call assert_equal(['This is a simple test: a~', ''], getline(1,'$'))
exe "norm! 1gg$3hr\<C-Q>x7e"
call assert_equal(['This is a simple test: ~~', ''], getline(1,'$'))
if &encoding == 'utf-8'
exe "norm! 1gg$4hr\<C-V>u20ac"
call assert_equal(['This is a simple test:€~~', ''], getline(1,'$'))
exe "norm! 1gg$5hr\<C-Q>u20ac"
call assert_equal(['This is a simple test€€~~', ''], getline(1,'$'))
exe "norm! 1gg0R\<C-V>xff WAS \<esc>"
call assert_equal(['ÿ WAS a simple test€€~~', ''], getline(1,'$'))
exe "norm! 1gg0elR\<C-Q>xffNOT\<esc>"
call assert_equal(['ÿ WASÿNOT simple test€€~~', ''], getline(1,'$'))
endif
call setline(1, 'This is a simple test: abcd')
exe "norm! 1gg$gr\<C-V>\<C-V>"
call assert_equal(['This is a simple test: abc', ''], getline(1,'$'))
exe "norm! 1gg$hgr\<C-Q>\<C-Q>"
call assert_equal(['This is a simple test: ab ', ''], getline(1,'$'))
exe "norm! 1gg$2hgr\<C-V>x7e"
call assert_equal(['This is a simple test: a~ ', ''], getline(1,'$'))
exe "norm! 1gg$3hgr\<C-Q>x7e"
call assert_equal(['This is a simple test: ~~ ', ''], getline(1,'$'))
" clean up
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab