mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:596a9f29c83a (#26146)

Browse Source 
runtime(doc): Fix whitespace and formatting of some help files (vim/vim#13549)

596a9f29c8

N/A patch:
vim-patch:aabca259fa48

Co-authored-by: h_east <h.east.727@gmail.com>
This commit is contained in:
zeertzjq
2023-11-22 10:46:11 +08:00
committed by GitHub
parent 91ef26dece
commit 820823c76d
3 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runtime/doc/builtin.txt generated
View File

@@ -5280,8 +5280,8 @@ printf({fmt}, {expr1} ...) *printf()*
msgid "%s returning %s" msgid "%s returning %s"
msgstr "waarde %2$s komt terug van %1$s" msgstr "waarde %2$s komt terug van %1$s"
< <
In this example, the sentence has its 2 string arguments reversed In this example, the sentence has its 2 string arguments
in the output. >vim reversed in the output. >vim
echo printf( echo printf(
"In The Netherlands, vim's creator's name is: %1$s %2$s", "In The Netherlands, vim's creator's name is: %1$s %2$s",
@@ -5319,14 +5319,14 @@ printf({fmt}, {expr1} ...) *printf()*
*E1500* *E1500*
You cannot mix positional and non-positional arguments: >vim You cannot mix positional and non-positional arguments: >vim
echo printf("%s%1$s", "One", "Two") echo printf("%s%1$s", "One", "Two")
< E1500: Cannot mix positional and non-positional < E1500: Cannot mix positional and non-positional arguments:
arguments: %s%1$s %s%1$s
*E1501* *E1501*
You cannot skip a positional argument in a format string: >vim You cannot skip a positional argument in a format string: >vim
echo printf("%3$s%1$s", "One", "Two", "Three") echo printf("%3$s%1$s", "One", "Two", "Three")
< E1501: format argument 2 unused in $-style < E1501: format argument 2 unused in $-style format:
format: %3$s%1$s %3$s%1$s
*E1502* *E1502*
You can re-use a [field-width] (or [precision]) argument: >vim You can re-use a [field-width] (or [precision]) argument: >vim
@@ -5335,20 +5335,20 @@ printf({fmt}, {expr1} ...) *printf()*
However, you can't use it as a different type: >vim However, you can't use it as a different type: >vim
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2) echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
< E1502: Positional argument 2 used as field < E1502: Positional argument 2 used as field width reused as
width reused as different type: long int/int different type: long int/int
*E1503* *E1503*
When a positional argument is used, but not the correct number When a positional argument is used, but not the correct number
or arguments is given, an error is raised: >vim or arguments is given, an error is raised: >vim
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2) echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
< E1503: Positional argument 3 out of bounds: < E1503: Positional argument 3 out of bounds: %1$d at width
%1$d at width %2$d is: %01$*2$.*3$d %2$d is: %01$*2$.*3$d
Only the first error is reported: >vim Only the first error is reported: >vim
echo printf("%01$*2$.*3$d %4$d", 1, 2) echo printf("%01$*2$.*3$d %4$d", 1, 2)
< E1503: Positional argument 3 out of bounds: < E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
%01$*2$.*3$d %4$d %4$d
*E1504* *E1504*
A positional argument can be used more than once: >vim A positional argument can be used more than once: >vim
@@ -5357,15 +5357,15 @@ printf({fmt}, {expr1} ...) *printf()*
However, you can't use a different type the second time: >vim However, you can't use a different type the second time: >vim
echo printf("%1$s %2$s %1$d", "One", "Two") echo printf("%1$s %2$s %1$d", "One", "Two")
< E1504: Positional argument 1 type used < E1504: Positional argument 1 type used inconsistently:
inconsistently: int/string int/string
*E1505* *E1505*
Various other errors that lead to a format string being Various other errors that lead to a format string being
wrongly formatted lead to: >vim wrongly formatted lead to: >vim
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2) echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
< E1505: Invalid format specifier: < E1505: Invalid format specifier: %1$d at width %2$d is:
%1$d at width %2$d is: %01$*2$.3$d %01$*2$.3$d
*E1507* *E1507*
This internal error indicates that the logic to parse a This internal error indicates that the logic to parse a

32
runtime/lua/vim/_meta/vimfn.lua generated
View File

@@ -6265,8 +6265,8 @@ function vim.fn.prevnonblank(lnum) end
--- msgid "%s returning %s" --- msgid "%s returning %s"
--- msgstr "waarde %2$s komt terug van %1$s" --- msgstr "waarde %2$s komt terug van %1$s"
--- < --- <
--- In this example, the sentence has its 2 string arguments reversed --- In this example, the sentence has its 2 string arguments
--- in the output. >vim --- reversed in the output. >vim
--- ---
--- echo printf( --- echo printf(
--- "In The Netherlands, vim's creator's name is: %1$s %2$s", --- "In The Netherlands, vim's creator's name is: %1$s %2$s",
@@ -6304,14 +6304,14 @@ function vim.fn.prevnonblank(lnum) end
--- *E1500* --- *E1500*
--- You cannot mix positional and non-positional arguments: >vim --- You cannot mix positional and non-positional arguments: >vim
--- echo printf("%s%1$s", "One", "Two") --- echo printf("%s%1$s", "One", "Two")
--- < E1500: Cannot mix positional and non-positional --- < E1500: Cannot mix positional and non-positional arguments:
--- arguments: %s%1$s --- %s%1$s
--- ---
--- *E1501* --- *E1501*
--- You cannot skip a positional argument in a format string: >vim --- You cannot skip a positional argument in a format string: >vim
--- echo printf("%3$s%1$s", "One", "Two", "Three") --- echo printf("%3$s%1$s", "One", "Two", "Three")
--- < E1501: format argument 2 unused in $-style --- < E1501: format argument 2 unused in $-style format:
--- format: %3$s%1$s --- %3$s%1$s
--- ---
--- *E1502* --- *E1502*
--- You can re-use a [field-width] (or [precision]) argument: >vim --- You can re-use a [field-width] (or [precision]) argument: >vim
@@ -6320,20 +6320,20 @@ function vim.fn.prevnonblank(lnum) end
--- ---
--- However, you can't use it as a different type: >vim --- However, you can't use it as a different type: >vim
--- echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2) --- echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
--- < E1502: Positional argument 2 used as field --- < E1502: Positional argument 2 used as field width reused as
--- width reused as different type: long int/int --- different type: long int/int
--- ---
--- *E1503* --- *E1503*
--- When a positional argument is used, but not the correct number --- When a positional argument is used, but not the correct number
--- or arguments is given, an error is raised: >vim --- or arguments is given, an error is raised: >vim
--- echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2) --- echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
--- < E1503: Positional argument 3 out of bounds: --- < E1503: Positional argument 3 out of bounds: %1$d at width
--- %1$d at width %2$d is: %01$*2$.*3$d --- %2$d is: %01$*2$.*3$d
--- ---
--- Only the first error is reported: >vim --- Only the first error is reported: >vim
--- echo printf("%01$*2$.*3$d %4$d", 1, 2) --- echo printf("%01$*2$.*3$d %4$d", 1, 2)
--- < E1503: Positional argument 3 out of bounds: --- < E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
--- %01$*2$.*3$d %4$d --- %4$d
--- ---
--- *E1504* --- *E1504*
--- A positional argument can be used more than once: >vim --- A positional argument can be used more than once: >vim
@@ -6342,15 +6342,15 @@ function vim.fn.prevnonblank(lnum) end
--- ---
--- However, you can't use a different type the second time: >vim --- However, you can't use a different type the second time: >vim
--- echo printf("%1$s %2$s %1$d", "One", "Two") --- echo printf("%1$s %2$s %1$d", "One", "Two")
--- < E1504: Positional argument 1 type used --- < E1504: Positional argument 1 type used inconsistently:
--- inconsistently: int/string --- int/string
--- ---
--- *E1505* --- *E1505*
--- Various other errors that lead to a format string being --- Various other errors that lead to a format string being
--- wrongly formatted lead to: >vim --- wrongly formatted lead to: >vim
--- echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2) --- echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
--- < E1505: Invalid format specifier: --- < E1505: Invalid format specifier: %1$d at width %2$d is:
--- %1$d at width %2$d is: %01$*2$.3$d --- %01$*2$.3$d
--- ---
--- *E1507* --- *E1507*
--- This internal error indicates that the logic to parse a --- This internal error indicates that the logic to parse a

32
src/nvim/eval.lua
View File

@@ -7552,8 +7552,8 @@ M.funcs = {
msgid "%s returning %s" msgid "%s returning %s"
msgstr "waarde %2$s komt terug van %1$s" msgstr "waarde %2$s komt terug van %1$s"
< <
In this example, the sentence has its 2 string arguments reversed In this example, the sentence has its 2 string arguments
in the output. >vim reversed in the output. >vim
echo printf( echo printf(
"In The Netherlands, vim's creator's name is: %1$s %2$s", "In The Netherlands, vim's creator's name is: %1$s %2$s",
@@ -7591,14 +7591,14 @@ M.funcs = {
*E1500* *E1500*
You cannot mix positional and non-positional arguments: >vim You cannot mix positional and non-positional arguments: >vim
echo printf("%s%1$s", "One", "Two") echo printf("%s%1$s", "One", "Two")
< E1500: Cannot mix positional and non-positional < E1500: Cannot mix positional and non-positional arguments:
arguments: %s%1$s %s%1$s
*E1501* *E1501*
You cannot skip a positional argument in a format string: >vim You cannot skip a positional argument in a format string: >vim
echo printf("%3$s%1$s", "One", "Two", "Three") echo printf("%3$s%1$s", "One", "Two", "Three")
< E1501: format argument 2 unused in $-style < E1501: format argument 2 unused in $-style format:
format: %3$s%1$s %3$s%1$s
*E1502* *E1502*
You can re-use a [field-width] (or [precision]) argument: >vim You can re-use a [field-width] (or [precision]) argument: >vim
@@ -7607,20 +7607,20 @@ M.funcs = {
However, you can't use it as a different type: >vim However, you can't use it as a different type: >vim
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2) echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
< E1502: Positional argument 2 used as field < E1502: Positional argument 2 used as field width reused as
width reused as different type: long int/int different type: long int/int
*E1503* *E1503*
When a positional argument is used, but not the correct number When a positional argument is used, but not the correct number
or arguments is given, an error is raised: >vim or arguments is given, an error is raised: >vim
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2) echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
< E1503: Positional argument 3 out of bounds: < E1503: Positional argument 3 out of bounds: %1$d at width
%1$d at width %2$d is: %01$*2$.*3$d %2$d is: %01$*2$.*3$d
Only the first error is reported: >vim Only the first error is reported: >vim
echo printf("%01$*2$.*3$d %4$d", 1, 2) echo printf("%01$*2$.*3$d %4$d", 1, 2)
< E1503: Positional argument 3 out of bounds: < E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
%01$*2$.*3$d %4$d %4$d
*E1504* *E1504*
A positional argument can be used more than once: >vim A positional argument can be used more than once: >vim
@@ -7629,15 +7629,15 @@ M.funcs = {
However, you can't use a different type the second time: >vim However, you can't use a different type the second time: >vim
echo printf("%1$s %2$s %1$d", "One", "Two") echo printf("%1$s %2$s %1$d", "One", "Two")
< E1504: Positional argument 1 type used < E1504: Positional argument 1 type used inconsistently:
inconsistently: int/string int/string
*E1505* *E1505*
Various other errors that lead to a format string being Various other errors that lead to a format string being
wrongly formatted lead to: >vim wrongly formatted lead to: >vim
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2) echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
< E1505: Invalid format specifier: < E1505: Invalid format specifier: %1$d at width %2$d is:
%1$d at width %2$d is: %01$*2$.3$d %01$*2$.3$d
*E1507* *E1507*
This internal error indicates that the logic to parse a This internal error indicates that the logic to parse a