# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1701112505 -3600
# Node ID f1a17857b9b06252671457769b3cc1f18d0a54fa
# Parent  4a0cb174c4c49c921f603eed9a52e3ca47b0b239
patch 9.0.2132: Duplicate Netbeans Error Message

Commit: https://github.com/vim/vim/commit/5c233437701e4a40327c73559cdda345471229b4
Author: Christian Brabandt <cb@256bit.org>
Date:   Mon Nov 27 20:04:24 2023 +0100

    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
--- 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 @@ 6.7 Protocol errors					*nb-protocol_err
 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
--- 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
--- a/src/errors.h
+++ b/src/errors.h
@@ -1658,8 +1658,7 @@ EXTERN char e_invalid_buffer_identifier_
 	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
--- 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
--- 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,