summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-07-27 13:18:14 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-27 13:18:14 +0100
commit34d1773bd4a1880616c5d7ef3a26f7bd69527589 (patch)
treebfe41e87bc44d6c0058a4cc7e3cca6a034380bc8
parent28f84e17b068daca2635692d279930dcb7a150d0 (diff)
downloadvim-git-34d1773bd4a1880616c5d7ef3a26f7bd69527589.tar.gz
patch 9.0.0091: duplicate error numberv9.0.0091
Problem: Duplicate error number. Solution: Use unique error number.
-rw-r--r--src/errors.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/errors.h b/src/errors.h
index e8008fd34..3b23c88ad 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3312,5 +3312,5 @@ EXTERN char e_cmdline_window_already_open[]
#endif
#ifdef FEAT_PROP_POPUP
EXTERN char e_cannot_use_negative_id_after_adding_textprop_with_text[]
- INIT(= N_("E1291: Cannot use a negative id after adding a textprop with text"));
+ INIT(= N_("E1293: Cannot use a negative id after adding a textprop with text"));
#endif
diff --git a/src/version.c b/src/version.c
index 2becd39a3..5adb215d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 91,
+/**/
90,
/**/
89,