To: vim_dev@googlegroups.com
Subject: Patch 8.2.4105
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.4105
Problem:    Translation related comment in the wrong place.
Solution:   Move it back with the text. (Ken Takata, closes #9537)
Files:      src/errors.h, src/ex_docmd.c


*** ../vim-8.2.4104/src/errors.h	2022-01-09 21:32:57.709739119 +0000
--- src/errors.h	2022-01-16 11:23:35.929735699 +0000
***************
*** 1239,1244 ****
--- 1239,1245 ----
  EXTERN char e_no_source_file_name_to_substitute_for_sfile[]
  	INIT(= N_("E498: no :source file name to substitute for \"<sfile>\""));
  EXTERN char e_empty_file_name_for_percent_or_hash_only_works_with_ph[]
+ 	// xgettext:no-c-format
  	INIT(= N_("E499: Empty file name for '%' or '#', only works with \":p:h\""));
  EXTERN char e_evaluates_to_an_empty_string[]
  	INIT(= N_("E500: Evaluates to an empty string"));
***************
*** 2041,2046 ****
--- 2042,2048 ----
  #endif
  #ifdef FEAT_EVAL
  EXTERN char e_cannot_use_percent_with_float[]
+ 	// xgettext:no-c-format
  	INIT(= N_("E804: Cannot use '%' with Float"));
  #endif
  #ifdef FEAT_FLOAT
***************
*** 2219,2224 ****
--- 2221,2227 ----
  	INIT(= N_("E863: Not allowed for a terminal in a popup window"));
  #endif
  EXTERN char e_percent_hash_can_only_be_followed_by_zero_one_two_automatic_engine_will_be_used[]
+ 	// xgettext:no-c-format
  	INIT(= N_("E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be used"));
  EXTERN char e_nfa_regexp_end_encountered_prematurely[]
  	INIT(= N_("E865: (NFA) Regexp end encountered prematurely"));
***************
*** 2464,2469 ****
--- 2467,2473 ----
  EXTERN char e_cannot_convert_between_str_and_str[]
  	INIT(= N_("E950: Cannot convert between %s and %s"));
  EXTERN char e_percent_value_too_large[]
+ 	// xgettext:no-c-format
  	INIT(= N_("E951: \\% value too large"));
  #if defined(FEAT_EVAL) && defined(FEAT_QUICKFIX)
  EXTERN char e_autocommand_caused_recursive_behavior[]
***************
*** 2690,2695 ****
--- 2694,2700 ----
  EXTERN char e_cannot_use_reserved_name[]
  	INIT(= N_("E1034: Cannot use reserved name %s"));
  EXTERN char e_percent_requires_number_arguments[]
+ 	// xgettext:no-c-format
  	INIT(= N_("E1035: % requires number arguments"));
  EXTERN char e_char_requires_number_or_float_arguments[]
  	INIT(= N_("E1036: %c requires number or float arguments"));
*** ../vim-8.2.4104/src/ex_docmd.c	2022-01-11 19:34:12.445500367 +0000
--- src/ex_docmd.c	2022-01-16 11:20:48.065818908 +0000
***************
*** 9219,9225 ****
      if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH)
      {
  	if (valid != VALID_HEAD + VALID_PATH)
- 	    // xgettext:no-c-format
  	    *errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph);
  	else
  	    *errormsg = _(e_evaluates_to_an_empty_string);
--- 9219,9224 ----
*** ../vim-8.2.4104/src/version.c	2022-01-16 11:11:56.386111546 +0000
--- src/version.c	2022-01-16 11:20:32.609823951 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4105,
  /**/

-- 
This is the polymorph virus!  Follow these instructions carefully:
1. Send this message to everybody you know.
2. Format your harddisk.
Thank you for your cooperation in spreading the most powerful virus ever!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///