patch 9.0.2132: Duplicate Netbeans Error Message

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>

diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 241fdb70be0071f787e185e078a170253a89fbd6..905c79791f40b1259a9d549f2456e50b730d25f5 100644 (file)
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 9.0.  Last change: 2022 Apr 03
+*netbeans.txt*  For Vim version 9.0.  Last change: 2023 Nov 26
 
 
                  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -846,7 +846,7 @@ REJECT              Not used.
 These errors occur when a message violates the protocol:
 *E627* *E628* *E629* *E632* *E633* *E634* *E635* *E636*
 *E637* *E638* *E639* *E640* *E641* *E642* *E643* *E644* *E645* *E646*
-*E647* *E648* *E649* *E650* *E651* *E652*
+*E647* *E648* *E650* *E651* *E652*
 
 
 ==============================================================================

diff --git a/runtime/doc/tags b/runtime/doc/tags
index 713a6d357e205cd97e065fc5597adf6fa239c48b..9a793e61516e6a48507bd29adabf87c76de18c07 100644 (file)
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5047,7 +5047,6 @@ E645      netbeans.txt    /*E645*
 E646   netbeans.txt    /*E646*
 E647   netbeans.txt    /*E647*
 E648   netbeans.txt    /*E648*
-E649   netbeans.txt    /*E649*
 E65    pattern.txt     /*E65*
 E650   netbeans.txt    /*E650*
 E651   netbeans.txt    /*E651*

diff --git a/src/errors.h b/src/errors.h
index 4424337ca7a94b9199648c55341ae33f54d81051..c8eaac7b89f3216e989c1699ebd6dc9d2da6ede5 100644 (file)
--- 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 a27148c6df5924f5ee562387fff3e845d2913fb5..ebdf3a44fab316c55f65f791cce333f0fbae0563 100644 (file)
--- 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 cfbe2fe3d1fed527188c22c2e8ab3332cb3c2d26..e5cb3c26126c9e9d4d3350b73e5a7fad92dbc6a9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2132,
 /**/
     2131,
 /**/