Skip to content

Commit 9e15b9f

Browse files
h-easth-east
authored
Merge pull request #1380 from vim-jp/hh-update-builtin
Update builtin.{txt,jax}
2 parents dab8d71 + d57d4e5 commit 9e15b9f

File tree

2 files changed

+108
-108
lines changed

2 files changed

+108
-108
lines changed

‎doc/builtin.jax

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim バージョン 9.0. Last change: 2023 Sep 27
1+
*builtin.txt* For Vim バージョン 9.0. Last change: 2023 Nov 20
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar
@@ -6654,94 +6654,94 @@ printf({fmt}, {expr1} ...) *printf()*
66546654
異なる翻訳に対応するために、位置引数を使用してこれを示すことが
66556655
できる。例えば: >
66566656

6657-
#, c-format
6658-
msgid "%s returning %s"
6659-
msgstr "waarde %2$s komt terug van %1$s"
6657+
#, c-format
6658+
msgid "%s returning %s"
6659+
msgstr "waarde %2$s komt terug van %1$s"
66606660
<
66616661
この例では、2 つの文字列引数を逆にした文が出力されている。 >
66626662

6663-
echo printf(
6664-
"In The Netherlands, vim's creator's name is: %1$s %2$s",
6665-
"Bram", "Moolenaar")
6666-
< オランダ語では、vim's creator's name is: Bram Moolenaar >
6663+
echo printf(
6664+
"In The Netherlands, vim's creator's name is: %1$s %2$s",
6665+
"Bram", "Moolenaar")
6666+
< オランダ語では、vim's creator's name is: Bram Moolenaar >
66676667

6668-
echo printf(
6669-
"In Belgium, vim's creator's name is: %2$s %1$s",
6670-
"Bram", "Moolenaar")
6671-
< ベルギー語では、vim's creator's name is: Moolenaar Bram
6668+
echo printf(
6669+
"In Belgium, vim's creator's name is: %2$s %1$s",
6670+
"Bram", "Moolenaar")
6671+
< ベルギー語では、vim's creator's name is: Moolenaar Bram
66726672

66736673
幅 (および精度) は、'*' 指定子を使用して指定できる。この場合、
66746674
引数リストでフィールド幅の位置を指定する必要がある。 >
66756675

6676-
echo printf("%1$*2$.*3$d", 1, 2, 3)
6677-
< 001 >
6678-
echo printf("%2$*3$.*1$d", 1, 2, 3)
6679-
< 2 >
6680-
echo printf("%3$*1$.*2$d", 1, 2, 3)
6681-
< 03 >
6682-
echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
6683-
< 1.414
6676+
echo printf("%1$*2$.*3$d", 1, 2, 3)
6677+
< 001 >
6678+
echo printf("%2$*3$.*1$d", 1, 2, 3)
6679+
< 2 >
6680+
echo printf("%3$*1$.*2$d", 1, 2, 3)
6681+
< 03 >
6682+
echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
6683+
< 1.414
66846684

66856685
幅や精度を直接指定することと、位置引数を介して指定することを組
66866686
み合わせることができます: >
66876687

6688-
echo printf("%1$4.*2$f", 1.4142135, 6)
6689-
< 1.414214 >
6690-
echo printf("%1$*2$.4f", 1.4142135, 6)
6691-
< 1.4142 >
6692-
echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
6693-
< 1.41
6688+
echo printf("%1$4.*2$f", 1.4142135, 6)
6689+
< 1.414214 >
6690+
echo printf("%1$*2$.4f", 1.4142135, 6)
6691+
< 1.4142 >
6692+
echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
6693+
< 1.41
66946694

66956695
*E1500*
66966696
位置引数と非位置引数を混在させることはできない: >
6697-
echo printf("%s%1$s", "One", "Two")
6698-
< E1500: Cannot mix positional and non-positional
6699-
arguments: %s%1$s
6697+
echo printf("%s%1$s", "One", "Two")
6698+
< E1500: Cannot mix positional and non-positional arguments:
6699+
%s%1$s
67006700

67016701
*E1501*
67026702
フォーマット文字列内の位置引数をスキップすることはできない: >
6703-
echo printf("%3$s%1$s", "One", "Two", "Three")
6704-
< E1501: format argument 2 unused in $-style
6705-
format: %3$s%1$s
6703+
echo printf("%3$s%1$s", "One", "Two", "Three")
6704+
< E1501: format argument 2 unused in $-style format:
6705+
%3$s%1$s
67066706

67076707
*E1502*
67086708
[field-width] (または [precision]) 引数を再利用できる: >
6709-
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
6710-
< 1 at width 2 is: 01
6709+
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
6710+
< 1 at width 2 is: 01
67116711

67126712
ただし、別の型として使用することはできない: >
6713-
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
6714-
< E1502: Positional argument 2 used as field
6715-
width reused as different type: long int/int
6713+
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
6714+
< E1502: Positional argument 2 used as field width reused as
6715+
different type: long int/int
67166716

67176717
*E1503*
67186718
位置引数が使用されているが、正しい数値または引数が指定されてい
67196719
ない場合、エラーが発生する: >
6720-
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
6721-
< E1503: Positional argument 3 out of bounds:
6722-
%1$d at width %2$d is: %01$*2$.*3$d
6720+
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
6721+
< E1503: Positional argument 3 out of bounds: %1$d at width
6722+
%2$d is: %01$*2$.*3$d
67236723

67246724
最初のエラーだけが報告される: >
6725-
echo printf("%01$*2$.*3$d %4$d", 1, 2)
6726-
< E1503: Positional argument 3 out of bounds:
6727-
%01$*2$.*3$d %4$d
6725+
echo printf("%01$*2$.*3$d %4$d", 1, 2)
6726+
< E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
6727+
%4$d
67286728

67296729
*E1504*
67306730
位置引数は複数回使用できる: >
6731-
echo printf("%1$s %2$s %1$s", "One", "Two")
6732-
< One Two One
6731+
echo printf("%1$s %2$s %1$s", "One", "Two")
6732+
< One Two One
67336733

67346734
ただし、2 回目には別の型を使用することはできない: >
6735-
echo printf("%1$s %2$s %1$d", "One", "Two")
6736-
< E1504: Positional argument 1 type used
6737-
inconsistently: int/string
6735+
echo printf("%1$s %2$s %1$d", "One", "Two")
6736+
< E1504: Positional argument 1 type used inconsistently:
6737+
int/string
67386738

67396739
*E1505*
67406740
フォーマット文字列が誤ってフォーマットされることにつながる他の
67416741
さまざまなエラーは、以下のようなものである: >
6742-
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
6743-
< E1505: Invalid format specifier:
6744-
%1$d at width %2$d is: %01$*2$.3$d
6742+
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
6743+
< E1505: Invalid format specifier: %1$d at width %2$d is:
6744+
%01$*2$.3$d
67456745

67466746
*E1507*
67476747
この内部エラーは、位置形式引数を解析するロジックで、他の方法で

‎en/builtin.txt

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim version 9.0. Last change: 2023 Sep 27
1+
*builtin.txt* For Vim version 9.0. Last change: 2023 Nov 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4008,8 +4008,8 @@ getqflist([{what}]) *getqflist()*
40084008
text description of the error
40094009
type type of the error, 'E', '1', etc.
40104010
valid |TRUE|: recognized error message
4011-
user_data
4012-
custom data associated with the item, can be
4011+
user_data
4012+
custom data associated with the item, can be
40134013
any type.
40144014

40154015
When there is no error list or it's empty, an empty list is
@@ -6793,96 +6793,96 @@ printf({fmt}, {expr1} ...) *printf()*
67936793
having a different word order, positional arguments may be
67946794
used to indicate this. For instance: >
67956795
6796-
#, c-format
6797-
msgid "%s returning %s"
6798-
msgstr "waarde %2$s komt terug van %1$s"
6796+
#, c-format
6797+
msgid "%s returning %s"
6798+
msgstr "waarde %2$s komt terug van %1$s"
67996799
<
6800-
In this example, the sentence has its 2 string arguments reversed
6801-
in the output. >
6800+
In this example, the sentence has its 2 string arguments
6801+
reversed in the output. >
68026802
6803-
echo printf(
6804-
"In The Netherlands, vim's creator's name is: %1$s %2$s",
6805-
"Bram", "Moolenaar")
6806-
< In The Netherlands, vim's creator's name is: Bram Moolenaar >
6803+
echo printf(
6804+
"In The Netherlands, vim's creator's name is: %1$s %2$s",
6805+
"Bram", "Moolenaar")
6806+
< In The Netherlands, vim's creator's name is: Bram Moolenaar >
68076807
6808-
echo printf(
6809-
"In Belgium, vim's creator's name is: %2$s %1$s",
6810-
"Bram", "Moolenaar")
6811-
< In Belgium, vim's creator's name is: Moolenaar Bram
6808+
echo printf(
6809+
"In Belgium, vim's creator's name is: %2$s %1$s",
6810+
"Bram", "Moolenaar")
6811+
< In Belgium, vim's creator's name is: Moolenaar Bram
68126812

68136813
Width (and precision) can be specified using the '*' specifier.
68146814
In this case, you must specify the field width position in the
68156815
argument list. >
68166816
6817-
echo printf("%1$*2$.*3$d", 1, 2, 3)
6818-
< 001 >
6819-
echo printf("%2$*3$.*1$d", 1, 2, 3)
6820-
< 2 >
6821-
echo printf("%3$*1$.*2$d", 1, 2, 3)
6822-
< 03 >
6823-
echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
6824-
< 1.414
6817+
echo printf("%1$*2$.*3$d", 1, 2, 3)
6818+
< 001 >
6819+
echo printf("%2$*3$.*1$d", 1, 2, 3)
6820+
< 2 >
6821+
echo printf("%3$*1$.*2$d", 1, 2, 3)
6822+
< 03 >
6823+
echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
6824+
< 1.414
68256825

68266826
You can mix specifying the width and/or precision directly
68276827
and via positional arguments: >
68286828
6829-
echo printf("%1$4.*2$f", 1.4142135, 6)
6830-
< 1.414214 >
6831-
echo printf("%1$*2$.4f", 1.4142135, 6)
6832-
< 1.4142 >
6833-
echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
6834-
< 1.41
6829+
echo printf("%1$4.*2$f", 1.4142135, 6)
6830+
< 1.414214 >
6831+
echo printf("%1$*2$.4f", 1.4142135, 6)
6832+
< 1.4142 >
6833+
echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
6834+
< 1.41
68356835

68366836
*E1500*
68376837
You cannot mix positional and non-positional arguments: >
6838-
echo printf("%s%1$s", "One", "Two")
6839-
< E1500: Cannot mix positional and non-positional
6840-
arguments: %s%1$s
6838+
echo printf("%s%1$s", "One", "Two")
6839+
< E1500: Cannot mix positional and non-positional arguments:
6840+
%s%1$s
68416841

68426842
*E1501*
68436843
You cannot skip a positional argument in a format string: >
6844-
echo printf("%3$s%1$s", "One", "Two", "Three")
6845-
< E1501: format argument 2 unused in $-style
6846-
format: %3$s%1$s
6844+
echo printf("%3$s%1$s", "One", "Two", "Three")
6845+
< E1501: format argument 2 unused in $-style format:
6846+
%3$s%1$s
68476847

68486848
*E1502*
68496849
You can re-use a [field-width] (or [precision]) argument: >
6850-
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
6851-
< 1 at width 2 is: 01
6850+
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
6851+
< 1 at width 2 is: 01
68526852

68536853
However, you can't use it as a different type: >
6854-
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
6855-
< E1502: Positional argument 2 used as field
6856-
width reused as different type: long int/int
6854+
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
6855+
< E1502: Positional argument 2 used as field width reused as
6856+
different type: long int/int
68576857

68586858
*E1503*
68596859
When a positional argument is used, but not the correct number
68606860
or arguments is given, an error is raised: >
6861-
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
6862-
< E1503: Positional argument 3 out of bounds:
6863-
%1$d at width %2$d is: %01$*2$.*3$d
6861+
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
6862+
< E1503: Positional argument 3 out of bounds: %1$d at width
6863+
%2$d is: %01$*2$.*3$d
68646864

68656865
Only the first error is reported: >
6866-
echo printf("%01$*2$.*3$d %4$d", 1, 2)
6867-
< E1503: Positional argument 3 out of bounds:
6868-
%01$*2$.*3$d %4$d
6866+
echo printf("%01$*2$.*3$d %4$d", 1, 2)
6867+
< E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
6868+
%4$d
68696869

68706870
*E1504*
68716871
A positional argument can be used more than once: >
6872-
echo printf("%1$s %2$s %1$s", "One", "Two")
6873-
< One Two One
6872+
echo printf("%1$s %2$s %1$s", "One", "Two")
6873+
< One Two One
68746874

68756875
However, you can't use a different type the second time: >
6876-
echo printf("%1$s %2$s %1$d", "One", "Two")
6877-
< E1504: Positional argument 1 type used
6878-
inconsistently: int/string
6876+
echo printf("%1$s %2$s %1$d", "One", "Two")
6877+
< E1504: Positional argument 1 type used inconsistently:
6878+
int/string
68796879

68806880
*E1505*
68816881
Various other errors that lead to a format string being
68826882
wrongly formatted lead to: >
6883-
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
6884-
< E1505: Invalid format specifier:
6885-
%1$d at width %2$d is: %01$*2$.3$d
6883+
echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
6884+
< E1505: Invalid format specifier: %1$d at width %2$d is:
6885+
%01$*2$.3$d
68866886

68876887
*E1507*
68886888
This internal error indicates that the logic to parse a
@@ -10177,8 +10177,8 @@ type({expr}) The result is a Number representing the type of {expr}.
1017710177
Job: 8 |v:t_job|
1017810178
Channel: 9 |v:t_channel|
1017910179
Blob: 10 |v:t_blob|
10180-
Class 12 |v:t_class|
10181-
Object 13 |v:t_object|
10180+
Class: 12 |v:t_class|
10181+
Object: 13 |v:t_object|
1018210182
For backward compatibility, this method can be used: >
1018310183
:if type(myvar) == type(0)
1018410184
:if type(myvar) == type("")

0 commit comments

Comments
 (0)