# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1640376002 -3600
# Node ID 3f209f13883d626092b8b24c314368c9abd83dab
# Parent  44dd563dce45f1a744581461def2845cc1f5090a
patch 8.2.3887: E1135 is used for two different errors

Commit: https://github.com/vim/vim/commit/806da5176e9e9ab011d927c4ca33a8dde1769539
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Dec 24 19:54:52 2021 +0000

    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
--- 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_argume
 	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
--- 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
--- 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,