From 8bb0878013a4507620201fa5aceb4c18e413bebe Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 6 Oct 2023 07:21:40 +0800 Subject: vim-patch:9.0.1990: strange error number Problem: strange error number Solution: change error number, add doc tag for E1507 closes: vim/vim#13270 https://github.com/vim/vim/commit/ea746f9e862092aef3d4e95c64d116759b9fabe0 Co-authored-by: Christ van Willegen --- src/nvim/eval.lua | 8 ++++++++ src/nvim/strings.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index 28fb9c6a5c..951dd2adbb 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -7572,6 +7572,14 @@ M.funcs = { echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2) < E1505: Invalid format specifier: %1$d at width %2$d is: %01$*2$.3$d + + *E1507* + This internal error indicates that the logic to + parse a positional format error ran into a problem + that couldn't be otherwise reported. Please file a + bug against vim if you run into this, copying the + exact format string and parameters that were used. + ]=], name = 'printf', params = { { 'fmt', 'any' }, { 'expr1', 'any' } }, diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 0d307a760f..7ba11ed8e5 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -46,7 +46,7 @@ static const char e_positional_arg_num_type_inconsistent_str_str[] static const char e_invalid_format_specifier_str[] = N_("E1505: Invalid format specifier: %s"); static const char e_aptypes_is_null_nr_str[] - = "E1520: Internal error: ap_types or ap_types[idx] is NULL: %d: %s"; + = "E1507: Internal error: ap_types or ap_types[idx] is NULL: %d: %s"; static const char typename_unknown[] = N_("unknown"); static const char typename_int[] = N_("int"); -- cgit From 92df389f1bc1709e56f3eaa0a4e0f3155dd86c97 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 7 Oct 2023 05:52:13 +0800 Subject: vim-patch:27e12c7669e3 runtime(doc): remove E1520 tag (vim/vim#13289) https://github.com/vim/vim/commit/27e12c7669e36a8f60fefa9db9a08024efeb06e8 --- src/nvim/eval.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index 951dd2adbb..5a47286980 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -7381,8 +7381,6 @@ M.funcs = { precision, the argument(s) to be used must also be specified using a {n$} positional argument specifier. See |printf-$|. - - *E1520* The conversion specifiers and their meanings are: *printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X* @@ -7574,11 +7572,11 @@ M.funcs = { %1$d at width %2$d is: %01$*2$.3$d *E1507* - This internal error indicates that the logic to - parse a positional format error ran into a problem - that couldn't be otherwise reported. Please file a - bug against vim if you run into this, copying the - exact format string and parameters that were used. + This internal error indicates that the logic to parse a + positional format argument ran into a problem that couldn't be + otherwise reported. Please file a bug against Vim if you run + into this, copying the exact format string and parameters that + were used. ]=], name = 'printf', -- cgit