mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #25529 from zeertzjq/vim-9.0.1990
vim-patch:9.0.1990,27e12c7669e3
This commit is contained in:
commit
7e9407490c
9
runtime/doc/builtin.txt
generated
9
runtime/doc/builtin.txt
generated
@ -5115,8 +5115,6 @@ printf({fmt}, {expr1} ...) *printf()*
|
||||
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*
|
||||
@ -5307,6 +5305,13 @@ printf({fmt}, {expr1} ...) *printf()*
|
||||
< 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 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.
|
||||
|
||||
prompt_getprompt({buf}) *prompt_getprompt()*
|
||||
Returns the effective prompt text for buffer {buf}. {buf} can
|
||||
be a buffer name or number. See |prompt-buffer|.
|
||||
|
9
runtime/lua/vim/_meta/vimfn.lua
generated
9
runtime/lua/vim/_meta/vimfn.lua
generated
@ -6098,8 +6098,6 @@ function vim.fn.prevnonblank(lnum) end
|
||||
--- 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*
|
||||
@ -6290,6 +6288,13 @@ function vim.fn.prevnonblank(lnum) end
|
||||
--- < 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 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.
|
||||
---
|
||||
--- @param fmt any
|
||||
--- @param expr1? any
|
||||
--- @return any
|
||||
|
@ -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*
|
||||
@ -7572,6 +7570,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 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',
|
||||
params = { { 'fmt', 'any' }, { 'expr1', 'any' } },
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user