Patch 8.2.3887

[Bram Moolenaar]

Patch 8.2.3887
Problem: E1135 is used for two different errors.
Solution: Renumber one error.
Files: src/errors.h, src/testdir/test_mapping.vim


*** ../vim-8.2.3886/src/errors.h 2021-12-20 12:24:59.381293520 +0000
--- src/errors.h 2021-12-24 19:48:40.196707162 +0000
***************
*** 603,612 ****
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>"));
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[]
--- 603,610 ----
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_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,854 ****
--- 850,854 ----
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>"));
*** ../vim-8.2.3886/src/testdir/test_mapping.vim 2021-10-16 13:00:10.940165406 +0100
--- src/testdir/test_mapping.vim 2021-12-24 19:49:30.948629699 +0000
***************
*** 905,911 ****
call assert_equal(0, x)

noremap <F3> <Cmd>let x = 3
! call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1135:')
call assert_equal(0, x)

" works in various modes and sees the correct mode()
--- 905,911 ----
call assert_equal(0, x)

noremap <F3> <Cmd>let x = 3
! call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1255:')
call assert_equal(0, x)

" works in various modes and sees the correct mode()
*** ../vim-8.2.3886/src/version.c 2021-12-24 19:24:39.619189424 +0000
--- src/version.c 2021-12-24 19:53:15.008291237 +0000
***************
*** 751,752 ****
--- 751,754 ----
{ /* Add new patch number below this line */
+ /**/
+ 3887,
/**/

--
From "know your smileys":
<|-) Chinese
<|-( Chinese and doesn't like these kind of jokes

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///