mirror of
				https://github.com/vim/vim.git
				synced 2025-11-03 09:44:48 -05:00 
			
		
		
		
	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>
			
			
This commit is contained in:
		@@ -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.
 | 
							  VIM REFERENCE MANUAL    by Gordon Prieur et al.
 | 
				
			||||||
@@ -846,7 +846,7 @@ REJECT		Not used.
 | 
				
			|||||||
These errors occur when a message violates the protocol:
 | 
					These errors occur when a message violates the protocol:
 | 
				
			||||||
*E627* *E628* *E629* *E632* *E633* *E634* *E635* *E636*
 | 
					*E627* *E628* *E629* *E632* *E633* *E634* *E635* *E636*
 | 
				
			||||||
*E637* *E638* *E639* *E640* *E641* *E642* *E643* *E644* *E645* *E646*
 | 
					*E637* *E638* *E639* *E640* *E641* *E642* *E643* *E644* *E645* *E646*
 | 
				
			||||||
*E647* *E648* *E649* *E650* *E651* *E652*
 | 
					*E647* *E648* *E650* *E651* *E652*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
==============================================================================
 | 
					==============================================================================
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5047,7 +5047,6 @@ E645	netbeans.txt	/*E645*
 | 
				
			|||||||
E646	netbeans.txt	/*E646*
 | 
					E646	netbeans.txt	/*E646*
 | 
				
			||||||
E647	netbeans.txt	/*E647*
 | 
					E647	netbeans.txt	/*E647*
 | 
				
			||||||
E648	netbeans.txt	/*E648*
 | 
					E648	netbeans.txt	/*E648*
 | 
				
			||||||
E649	netbeans.txt	/*E649*
 | 
					 | 
				
			||||||
E65	pattern.txt	/*E65*
 | 
					E65	pattern.txt	/*E65*
 | 
				
			||||||
E650	netbeans.txt	/*E650*
 | 
					E650	netbeans.txt	/*E650*
 | 
				
			||||||
E651	netbeans.txt	/*E651*
 | 
					E651	netbeans.txt	/*E651*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1658,8 +1658,7 @@ EXTERN char e_invalid_buffer_identifier_in_setdot[]
 | 
				
			|||||||
	INIT(= N_("E647: Invalid buffer identifier in setDot"));
 | 
						INIT(= N_("E647: Invalid buffer identifier in setDot"));
 | 
				
			||||||
EXTERN char e_invalid_buffer_identifier_in_close[]
 | 
					EXTERN char e_invalid_buffer_identifier_in_close[]
 | 
				
			||||||
	INIT(= N_("E648: Invalid buffer identifier in close"));
 | 
						INIT(= N_("E648: Invalid buffer identifier in close"));
 | 
				
			||||||
EXTERN char e_invalid_buffer_identifier_in_close_2[]
 | 
					// E649 unused
 | 
				
			||||||
	INIT(= N_("E649: Invalid buffer identifier in close"));
 | 
					 | 
				
			||||||
EXTERN char e_invalid_buffer_identifier_in_defineannotype[]
 | 
					EXTERN char e_invalid_buffer_identifier_in_defineannotype[]
 | 
				
			||||||
	INIT(= N_("E650: Invalid buffer identifier in defineAnnoType"));
 | 
						INIT(= N_("E650: Invalid buffer identifier in defineAnnoType"));
 | 
				
			||||||
EXTERN char e_invalid_buffer_identifier_in_addanno[]
 | 
					EXTERN char e_invalid_buffer_identifier_in_addanno[]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1875,7 +1875,7 @@ nb_do_cmd(
 | 
				
			|||||||
		// This message was commented out, probably because it can
 | 
							// This message was commented out, probably because it can
 | 
				
			||||||
		// happen when shutting down.
 | 
							// happen when shutting down.
 | 
				
			||||||
		if (p_verbose > 0)
 | 
							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));
 | 
						    nbdebug(("    CLOSE %d: %s\n", bufno, name));
 | 
				
			||||||
#ifdef FEAT_GUI
 | 
					#ifdef FEAT_GUI
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -704,6 +704,8 @@ static char *(features[]) =
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static int included_patches[] =
 | 
					static int included_patches[] =
 | 
				
			||||||
{   /* Add new patch number below this line */
 | 
					{   /* Add new patch number below this line */
 | 
				
			||||||
 | 
					/**/
 | 
				
			||||||
 | 
					    2132,
 | 
				
			||||||
/**/
 | 
					/**/
 | 
				
			||||||
    2131,
 | 
					    2131,
 | 
				
			||||||
/**/
 | 
					/**/
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user