patch 8.2.4105: translation related comment in the wrong place

Problem:    Translation related comment in the wrong place.
Solution:   Move it back with the text. (Ken Takata, closes #9537)

diff --git a/src/errors.h b/src/errors.h
index 7059b28da326380da97061cdd9ce6223743ea485..5e9b6af5d37d7a13f1ffbc85a4a8150a09cb7ffb 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -1239,6 +1239,7 @@ EXTERN char e_no_autocommand_match_name_to_substitute_for_amatch[]
 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,6 +2042,7 @@ EXTERN char e_id_not_found_nr[]
 #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,6 +2221,7 @@ EXTERN char e_not_allowed_for_terminal_in_popup_window[]
        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,6 +2467,7 @@ EXTERN char e_file_changed_while_writing[]
 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,6 +2694,7 @@ EXTERN char e_catch_unreachable_after_catch_all[]
 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"));

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f16f6009fdbcc5abae3beb51f871834aa5d9e0ec..d8d77ce4d2a0225c25bc07b85ee8d71ac3b89da4 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9219,7 +9219,6 @@ eval_vars(
     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);

diff --git a/src/version.c b/src/version.c
index 52b75a67d8d26c82b3e67cedd5ee183c699f478c..8ddd419db1587cc713f7bd8680bd78708f37c44f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4105,
 /**/
     4104,
 /**/