diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-24 19:54:52 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-24 19:54:52 +0000 |
| commit | 806da5176e9e9ab011d927c4ca33a8dde1769539 (patch) | |
| tree | 644e4bc3000b045d4b8d5151769990cd601cf5d9 | |
| parent | b6db1467622be046dbf00b2213fd9f49f4f3cccb (diff) | |
| download | vim-git-806da5176e9e9ab011d927c4ca33a8dde1769539.tar.gz | |
patch 8.2.3887: E1135 is used for two different errorsv8.2.3887
Problem: E1135 is used for two different errors.
Solution: Renumber one error.
| -rw-r--r-- | src/errors.h | 6 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/errors.h b/src/errors.h index 8d8a2ca9a..e5b8cd218 100644 --- a/src/errors.h +++ b/src/errors.h @@ -603,10 +603,8 @@ EXTERN char e_cannot_extend_null_list[] EXTERN char e_using_string_as_bool_str[] INIT(= N_("E1135: Using a String as a Bool: \"%s\"")); #endif -EXTERN char e_cmd_mapping_must_end_with_cr[] - INIT(=N_("E1135: <Cmd> mapping must end with <CR>")); EXTERN char e_cmd_mapping_must_end_with_cr_before_second_cmd[] - INIT(=N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>")); + INIT(= N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>")); EXTERN char e_cmd_maping_must_not_include_str_key[] INIT(= N_("E1137: <Cmd> mapping must not include %s key")); EXTERN char e_using_bool_as_number[] @@ -852,3 +850,5 @@ EXTERN char e_string_expected_for_argument_nr[] INIT(= N_("E1253: String expected for argument %d")); EXTERN char e_cannot_use_script_variable_in_for_loop[] INIT(= N_("E1254: Cannot use script variable in for loop")); +EXTERN char e_cmd_mapping_must_end_with_cr[] + INIT(= N_("E1255: <Cmd> mapping must end with <CR>")); diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index d2b9f37d1..dd0c8d104 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -905,7 +905,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() diff --git a/src/version.c b/src/version.c index 14e65f145..0809436d2 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3887, +/**/ 3886, /**/ 3885, |