summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2023-11-27 20:04:24 +0100
committerChristian Brabandt <cb@256bit.org>2023-11-27 20:04:24 +0100
commit5c233437701e4a40327c73559cdda345471229b4 (patch)
treea706112224a884c5db0f607c303040db98e8d2dd /src
parentb9efc72c2432f2d2a633c12d3a5b9fc3efb7b6e7 (diff)
patch 9.0.2132: Duplicate Netbeans Error Messagev9.0.2132
Problem: Duplicate Netbeans Error Message Solution: Remove duplicate message We have 2 error Messages used for the Netbeans interface: - EXTERN char e_invalid_buffer_identifier_in_close[] INIT(= N_("E648: Invalid buffer identifier in close")); - EXTERN char e_invalid_buffer_identifier_in_close_2[] INIT(= N_("E649: Invalid buffer identifier in close")); Since the error message is exactly the same, get rid of the second message. closes: #13584 Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
-rw-r--r--src/errors.h3
-rw-r--r--src/netbeans.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/errors.h b/src/errors.h
index 4424337ca7..c8eaac7b89 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1658,8 +1658,7 @@ EXTERN char e_invalid_buffer_identifier_in_setdot[]
INIT(= N_("E647: Invalid buffer identifier in setDot"));
EXTERN char e_invalid_buffer_identifier_in_close[]
INIT(= N_("E648: Invalid buffer identifier in close"));
-EXTERN char e_invalid_buffer_identifier_in_close_2[]
- INIT(= N_("E649: Invalid buffer identifier in close"));
+// E649 unused
EXTERN char e_invalid_buffer_identifier_in_defineannotype[]
INIT(= N_("E650: Invalid buffer identifier in defineAnnoType"));
EXTERN char e_invalid_buffer_identifier_in_addanno[]
diff --git a/src/netbeans.c b/src/netbeans.c
index a27148c6df..ebdf3a44fa 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -1875,7 +1875,7 @@ nb_do_cmd(
// This message was commented out, probably because it can
// happen when shutting down.
if (p_verbose > 0)
- emsg(_(e_invalid_buffer_identifier_in_close_2));
+ emsg(_(e_invalid_buffer_identifier_in_close));
}
nbdebug((" CLOSE %d: %s\n", bufno, name));
#ifdef FEAT_GUI
diff --git a/src/version.c b/src/version.c
index cfbe2fe3d1..e5cb3c2612 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2132,
+/**/
2131,
/**/
2130,