patch 8.2.3887: E1135 is used for two different errors
Problem: E1135 is used for two different errors.
Solution: Renumber one error.
diff --git a/src/errors.h b/src/errors.h
index 8d8a2ca..e5b8cd2 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -603,10 +603,8 @@
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 @@
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 d2b9f37..dd0c8d1 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -905,7 +905,7 @@
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 14e65f1..0809436 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3887,
+/**/
3886,
/**/
3885,