IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3887: E1135 is used for two different errors

Browse Source 
Problem:    E1135 is used for two different errors.
Solution:   Renumber one error.

806da5176e

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-05-07 08:33:06 +08:00
parent f7c1e460f8
commit 29c228dc10
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/map.txt
View File

@ -352,7 +352,7 @@ Note:
- In Visual mode you can use `line('v')` and `col('v')` to get one end of the - In Visual mode you can use `line('v')` and `col('v')` to get one end of the
Visual area, the cursor is at the other end. Visual area, the cursor is at the other end.
*E1135* *E1136* *E1255* *E1136*
<Cmd> commands must terminate, that is, they must be followed by <CR> in the <Cmd> commands must terminate, that is, they must be followed by <CR> in the
{rhs} of the mapping definition. |Command-line| mode is never entered. {rhs} of the mapping definition. |Command-line| mode is never entered.

2
src/nvim/getchar.c
View File

@ -135,7 +135,7 @@ static size_t last_recorded_len = 0; // number of last recorded chars
static const char e_recursive_mapping[] = N_("E223: Recursive mapping"); static const char e_recursive_mapping[] = N_("E223: Recursive mapping");
static const char e_cmd_mapping_must_end_with_cr[] static const char e_cmd_mapping_must_end_with_cr[]
= N_("E1135: <Cmd> mapping must end with <CR>"); = N_("E1255: <Cmd> mapping must end with <CR>");
static const char e_cmd_mapping_must_end_with_cr_before_second_cmd[] static const char e_cmd_mapping_must_end_with_cr_before_second_cmd[]
= N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>"); = N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>");

2
test/functional/ex_cmds/cmd_map_spec.lua
View File

@ -103,7 +103,7 @@ describe('mappings with <Cmd>', function()
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{2:E1135: <Cmd> mapping must end with <CR>} | {2:E1255: <Cmd> mapping must end with <CR>} |
]]) ]])
eq(0, eval('x')) eq(0, eval('x'))
end) end)

2
test/old/testdir/test_mapping.vim
View File

@ -984,7 +984,7 @@ func Test_map_cmdkey()
call assert_equal(0, x) call assert_equal(0, x)
noremap <F3> <Cmd>let x = 3 noremap <F3> <Cmd>let x = 3
call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1135:') call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1255:')
call assert_equal(0, x) call assert_equal(0, x)
" works in various modes and sees the correct mode() " works in various modes and sees the correct mode()