aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-02-18 06:52:56 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-02-18 07:05:48 +0800
commit75dab3cf0781f664ac866f511df2fb2c06aa7d17 (patch)
treeea4012b48ec14be83ee3866936a1a2378b2debb4
parentf905ab04507fc5a86affeb5eaf8550c1795ac9b8 (diff)
downloadrneovim-75dab3cf0781f664ac866f511df2fb2c06aa7d17.tar.gz
rneovim-75dab3cf0781f664ac866f511df2fb2c06aa7d17.tar.bz2
rneovim-75dab3cf0781f664ac866f511df2fb2c06aa7d17.zip
fix(mappings): make "<" escaping in completion match Vim
-rw-r--r--src/nvim/mapping.c2
-rw-r--r--src/nvim/testdir/test_autocmd.vim2
-rw-r--r--src/nvim/testdir/test_cmdline.vim4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c
index 0b2cf6ea47..ce4c0586e3 100644
--- a/src/nvim/mapping.c
+++ b/src/nvim/mapping.c
@@ -1194,7 +1194,7 @@ static char *translate_mapping(char_u *str, int cpo_flags)
}
if (c == ' ' || c == '\t' || c == Ctrl_J || c == Ctrl_V
- || (c == '\\' && !cpo_bslash)) {
+ || c == '<' || (c == '\\' && !cpo_bslash)) {
ga_append(&ga, cpo_bslash ? Ctrl_V : '\\');
}
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 30d30c8b29..6d7f1649b3 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -2720,7 +2720,7 @@ func Test_autocmd_bufreadpre()
close
close
call delete('XAutocmdBufReadPre.txt')
- " set cpo-=g
+ set cpo-=g
endfunc
" FileChangedShell tested in test_filechanged.vim
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index cf1d56ae38..64bfb142e7 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -340,7 +340,7 @@ func Test_map_completion()
call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal('"map <Left>', getreg(':'))
call feedkeys(":map <M\<Tab>\<Home>\"\<CR>", 'xt')
- " call assert_equal("\"map <M\<Tab>", getreg(':'))
+ call assert_equal("\"map <M\<Tab>", getreg(':'))
unmap <Left>
" set cpo+=<
@@ -369,7 +369,7 @@ func Test_map_completion()
call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal('"map <Left>', getreg(':'))
unmap <Left>
- " set cpo-=k
+ set cpo-=k
call assert_fails('call feedkeys(":map \\\\%(\<Tab>\<Home>\"\<CR>", "xt")', 'E53:')