• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révisionc83631ad3d2ab4393e1904e44961fc2a6630fcc5 (tree)
l'heure2022-01-16 20:30:04
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

patch 8.2.4105: translation related comment in the wrong place

Commit: https://github.com/vim/vim/commit/b5988e365646746029e13473251e5844440d819c
Author: K.Takata <kentkt@csc.jp>
Date: Sun Jan 16 11:25:26 2022 +0000

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 https://github.com/vim/vim/issues/9537)

Change Summary

Modification

diff -r 7bb327c29de3 -r c83631ad3d2a src/errors.h
--- a/src/errors.h Sun Jan 16 12:15:06 2022 +0100
+++ b/src/errors.h Sun Jan 16 12:30:04 2022 +0100
@@ -1239,6 +1239,7 @@
12391239 EXTERN char e_no_source_file_name_to_substitute_for_sfile[]
12401240 INIT(= N_("E498: no :source file name to substitute for \"<sfile>\""));
12411241 EXTERN char e_empty_file_name_for_percent_or_hash_only_works_with_ph[]
1242+ // xgettext:no-c-format
12421243 INIT(= N_("E499: Empty file name for '%' or '#', only works with \":p:h\""));
12431244 EXTERN char e_evaluates_to_an_empty_string[]
12441245 INIT(= N_("E500: Evaluates to an empty string"));
@@ -2041,6 +2042,7 @@
20412042 #endif
20422043 #ifdef FEAT_EVAL
20432044 EXTERN char e_cannot_use_percent_with_float[]
2045+ // xgettext:no-c-format
20442046 INIT(= N_("E804: Cannot use '%' with Float"));
20452047 #endif
20462048 #ifdef FEAT_FLOAT
@@ -2219,6 +2221,7 @@
22192221 INIT(= N_("E863: Not allowed for a terminal in a popup window"));
22202222 #endif
22212223 EXTERN char e_percent_hash_can_only_be_followed_by_zero_one_two_automatic_engine_will_be_used[]
2224+ // xgettext:no-c-format
22222225 INIT(= N_("E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be used"));
22232226 EXTERN char e_nfa_regexp_end_encountered_prematurely[]
22242227 INIT(= N_("E865: (NFA) Regexp end encountered prematurely"));
@@ -2464,6 +2467,7 @@
24642467 EXTERN char e_cannot_convert_between_str_and_str[]
24652468 INIT(= N_("E950: Cannot convert between %s and %s"));
24662469 EXTERN char e_percent_value_too_large[]
2470+ // xgettext:no-c-format
24672471 INIT(= N_("E951: \\% value too large"));
24682472 #if defined(FEAT_EVAL) && defined(FEAT_QUICKFIX)
24692473 EXTERN char e_autocommand_caused_recursive_behavior[]
@@ -2690,6 +2694,7 @@
26902694 EXTERN char e_cannot_use_reserved_name[]
26912695 INIT(= N_("E1034: Cannot use reserved name %s"));
26922696 EXTERN char e_percent_requires_number_arguments[]
2697+ // xgettext:no-c-format
26932698 INIT(= N_("E1035: % requires number arguments"));
26942699 EXTERN char e_char_requires_number_or_float_arguments[]
26952700 INIT(= N_("E1036: %c requires number or float arguments"));
diff -r 7bb327c29de3 -r c83631ad3d2a src/ex_docmd.c
--- a/src/ex_docmd.c Sun Jan 16 12:15:06 2022 +0100
+++ b/src/ex_docmd.c Sun Jan 16 12:30:04 2022 +0100
@@ -9219,7 +9219,6 @@
92199219 if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH)
92209220 {
92219221 if (valid != VALID_HEAD + VALID_PATH)
9222- // xgettext:no-c-format
92239222 *errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph);
92249223 else
92259224 *errormsg = _(e_evaluates_to_an_empty_string);
diff -r 7bb327c29de3 -r c83631ad3d2a src/version.c
--- a/src/version.c Sun Jan 16 12:15:06 2022 +0100
+++ b/src/version.c Sun Jan 16 12:30:04 2022 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 4105,
755+/**/
754756 4104,
755757 /**/
756758 4103,
Afficher sur ancien navigateur de dépôt.