summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-02-03 20:09:19 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-03 20:09:19 +0000
commit5658ca343f49a770ec068a858f52547ce822afa1 (patch)
tree373a6941a6557400d5742606d6ef1307d6cc4d62
parenta8ec4916caadd0a5113b7d41fa81d6d2c807260f (diff)
downloadvim-git-5658ca343f49a770ec068a858f52547ce822afa1.tar.gz
patch 8.2.4291: error number used twicev8.2.4291
Problem: Error number used twice. Solution: Renumber of of the errors.
-rw-r--r--src/errors.h5
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/errors.h b/src/errors.h
index 9a5da9c0d..80a9a5aae 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -2809,7 +2809,8 @@ EXTERN char e_cannot_assign_to_argument[]
INIT(= N_("E1090: Cannot assign to argument %s"));
EXTERN char e_function_is_not_compiled_str[]
INIT(= N_("E1091: Function is not compiled: %s"));
-// E1092 unused
+EXTERN char e_cannot_nest_redir[]
+ INIT(= N_("E1092: Cannot nest :redir"));
EXTERN char e_expected_nr_items_but_got_nr[]
INIT(= N_("E1093: Expected %d items but got %d"));
EXTERN char e_import_can_only_be_used_in_script[]
@@ -3012,8 +3013,6 @@ EXTERN char e_cannot_use_range_with_assignment_operator_str[]
#ifdef FEAT_EVAL
EXTERN char e_blob_not_set[]
INIT(= N_("E1184: Blob not set"));
-EXTERN char e_cannot_nest_redir[]
- INIT(= N_("E1185: Cannot nest :redir"));
EXTERN char e_missing_redir_end[]
INIT(= N_("E1185: Missing :redir END"));
EXTERN char e_expression_does_not_result_in_value_str[]
diff --git a/src/version.c b/src/version.c
index 6c09fb582..1e5ac239e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4291,
+/**/
4290,
/**/
4289,