diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-07 08:33:06 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-05-08 01:12:09 +0800 |
| commit | 29c228dc1087676af5b72f4145ab146cff75156e (patch) | |
| tree | 15b8e4f32045d5e01a5771e887e3de420e49817c | |
| parent | f7c1e460f8ae9e316a679a29945ce6a585336322 (diff) | |
| download | rneovim-29c228dc1087676af5b72f4145ab146cff75156e.tar.gz rneovim-29c228dc1087676af5b72f4145ab146cff75156e.tar.bz2 rneovim-29c228dc1087676af5b72f4145ab146cff75156e.zip | |
vim-patch:8.2.3887: E1135 is used for two different errors
Problem: E1135 is used for two different errors.
Solution: Renumber one error.
https://github.com/vim/vim/commit/806da5176e9e9ab011d927c4ca33a8dde1769539
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | runtime/doc/map.txt | 2 | ||||
| -rw-r--r-- | src/nvim/getchar.c | 2 | ||||
| -rw-r--r-- | test/functional/ex_cmds/cmd_map_spec.lua | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_mapping.vim | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index fccb6eeb75..9ec592215e 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -352,7 +352,7 @@ Note: - 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. - *E1135* *E1136* + *E1255* *E1136* <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. diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 32fa517324..07d7887fc6 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -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_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[] = N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>"); diff --git a/test/functional/ex_cmds/cmd_map_spec.lua b/test/functional/ex_cmds/cmd_map_spec.lua index a0aec7fdd0..12867179bd 100644 --- a/test/functional/ex_cmds/cmd_map_spec.lua +++ b/test/functional/ex_cmds/cmd_map_spec.lua @@ -103,7 +103,7 @@ describe('mappings with <Cmd>', function() {1:~ }| {1:~ }| {1:~ }| - {2:E1135: <Cmd> mapping must end with <CR>} | + {2:E1255: <Cmd> mapping must end with <CR>} | ]]) eq(0, eval('x')) end) diff --git a/test/old/testdir/test_mapping.vim b/test/old/testdir/test_mapping.vim index ec57bea59e..0cf357694f 100644 --- a/test/old/testdir/test_mapping.vim +++ b/test/old/testdir/test_mapping.vim @@ -984,7 +984,7 @@ func Test_map_cmdkey() call assert_equal(0, x) 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) " works in various modes and sees the correct mode() |