Closed h-east closed 3 months ago
ハイライト戻し忘れ
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5fd401c60..4bef930fb 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -9300,7 +9300,7 @@ strutf16len({string} [, {countcc}]) *strutf16len()*
echo strutf16len('ą́') returns 1
echo strutf16len('ą́', v:true) returns 3
- Can also be used as a |method|: >
+< Can also be used as a |method|: >
GetText()->strutf16len()
<
strwidth({string}) *strwidth()*
Sub-expression は10個までじゃなくて9個まで。
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 9e048ff64..4fa26e043 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1080,7 +1080,7 @@ match ASCII characters, as indicated by the range.
\(\) A pattern enclosed by escaped parentheses. */\(* */\(\)* */\)*
E.g., "\(^a\)" matches 'a' at the start of a line.
- There can only be ten of these. You can use "\%(" to add more, but
+ There can only be nine of these. You can use "\%(" to add more, but
not counting it as a sub-expression.
*E51* *E54* *E55* *E872* *E873*
ちなみに日本語訳のほうは「これらはx個しかありません。」では意味が通らなくて「これらはx個しか存在できません。」のほうがよさそう。 https://github.com/vim-jp/vimdoc-ja-working/commit/e721c50044c3b58bc0cb36857bc2a9fc0d9e81a7#diff-3dd3ca7ec84dffc2e18eb6a5ab132e704be8ceec05fabc923193c2ad065413a0R1060
via Vim 9.0.1677
diff --git runtime/doc/cmdline.txt runtime/doc/cmdline.txt
index d2e476f00..41d3233af 100644
--- runtime/doc/cmdline.txt
+++ runtime/doc/cmdline.txt
@@ -778,7 +778,7 @@ An example for subtracting (which isn't very useful): >
On this text:
1 one ~
2 two ~
- 3 three FOLDED~
+ 3 three FOLDED ~
4 four FOLDED ~
5 five FOLDED ~
6 six FOLDED ~
https://github.com/vim-jp/issues/issues/1387#issuecomment-1585771454 ↑のPRはBramによってCloseされましたが、実際には取り込まれていないので、いくつかのtypo修正を追加して再度PRを出しました。↓
https://github.com/vim-jp/issues/issues/1387#issuecomment-1492920584
単なるインデントミスだと思います。
箇条書きと言っていいのか分かりませんが、意図したインデントのように思いました。
@k-takata 了解です。本家へのPRも修正しました。
警察w 案件。
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 6eecd7afe..1cd8c4db1 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4199,7 +4199,7 @@ getscriptinfo([{opts}]) *getscriptinfo()*
Note that this is a copy, the value of
script-local variables cannot be changed using
this dictionary.
- version Vimscript version (|scriptversion|)
+ version Vim script version (|scriptversion|)
Examples: >
:echo getscriptinfo({'name': 'myscript'})
from https://github.com/vim-jp/vimdoc-ja-working/pull/1313
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 8cae93ab8..a16c8aca6 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1236,7 +1236,7 @@ variable. It supports 3 keys, `line_continuation`, `more_in_bracket_block`,
and `searchpair_timeout`.
`line_continuation` expects a number which will be added to the indent level of
a continuation line starting with a backslash, and defaults to
-`shiftwidth() * 3`. It also accepts a string, which is evaluated at runtime.
+`shiftwidth() * 3` . It also accepts a string, which is evaluated at runtime.
`more_in_bracket_block` expects a boolean value; when on, an extra
`shiftwidth()` is added inside blocks surrounded with brackets. It defaults to
`v:false`.
@@ -1244,14 +1244,14 @@ a continuation line starting with a backslash, and defaults to
a timeout. Increasing the value might give more accurate results, but also
causes the indentation to take more time. It defaults to 100 (milliseconds).
-Example of configuration:
+Example of configuration: >
let g:vim_indent = #{
\ line_continuation: shiftwidth() * 3,
\ more_in_bracket_block: v:false,
\ searchpair_timeout: 100,
\ }
-
+<
*g:vim_indent_cont*
This variable is equivalent to `g:vim_indent.line_continuation`.
It's supported for backward compatibility.
from https://github.com/vim-jp/vimdoc-ja-working/pull/1315
80桁超え
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index b19c3067c..1e862360e 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -217,7 +217,8 @@ Vim would never have become what it is now, without the help of these people!
Bill Foster Athena GUI port (later removed)
Google Let Bram work on Vim one day a week
Loic Grenie xvim (ideas for multi windows version)
- Sven Guckes Vim promoter and previous WWW page maintainer |Sven-Guckes|
+ Sven Guckes Vim promoter and previous WWW page maintainer
+ |Sven-Guckes|
Darren Hiebert Exuberant ctags
Jason Hildebrand GTK+ 2 port
Bruce Hunsaker improvements for VMS port
from https://github.com/vim-jp/vimdoc-ja-working/pull/1317
80桁超えとtypo
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c51866390..ee65df32f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -71,7 +71,7 @@ achieve special effects. These options come in three forms:
'ttytype'
Warning: This may have a lot of side effects.
- *:set-args* *:set=* *E487* *E521*
+ *:set-args* *:set=* *E487* *E521*
:se[t] {option}={value} or
:se[t] {option}:{value}
Set string or number option to {value}.
@@ -4304,8 +4304,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|hl-PmenuSel| = popup menu selected line
|hl-PmenuKind| [ popup menu "kind" normal line
|hl-PmenuKindSel| ] popup menu "kind" selected line
- |hl-PmenuExtra| { popup menu "kind" normal line
- |hl-PmenuExtraSel| } popup menu "kind" selected line
+ |hl-PmenuExtra| { popup menu "extra" normal line
+ |hl-PmenuExtraSel| } popup menu "extra" selected line
|hl-PmenuSbar| x popup menu scrollbar
|hl-PmenuThumb| X popup menu scrollbar thumb
from https://github.com/vim-jp/vimdoc-ja-working/pull/1323
コードハイライト開始記号 >
追加。
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index fe560d380..057d20158 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2797,7 +2797,7 @@ The first option implies the second one.
For highlighted trailing whitespace and mix of spaces and tabs: >
:let python_space_error_highlight = 1
-If you want all possible Python highlighting:
+If you want all possible Python highlighting: >
:let python_highlight_all = 1
This has the same effect as setting python_space_error_highlight and
unsetting all the other ones.
From https://github.com/vim-jp/vimdoc-ja-working/pull/1333
80桁超え
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index d5aa79e31..b40763123 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -877,7 +877,8 @@ Other computation: *bitwise-function*
srand() initialize seed used by rand()
Variables: *var-functions*
- instanceof() check if a variable is an instance of a given class
+ instanceof() check if a variable is an instance of a given
+ class
type() type of a variable as a number
typename() type of a variable as text
islocked() check if a variable is locked
https://github.com/vim-jp/vimdoc-ja-working/pull/1328#discussion_r1359078955
原文からしてですが、't は 「t でマークされている」 とかほしいですね
From https://github.com/vim-jp/vimdoc-ja-working/pull/1325#discussion_r1359206074
前項と同様に変数名を明記。
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 62bc6e657..310373894 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1485,8 +1485,9 @@ If there is no g:termdebug_config you can use: >
Any value greater than 1 will set the Asm window height to that value.
*termdebug_variables_window*
-If you want the Var window shown by default, set the flag to 1.
-the "variables_window_height" entry can be used to set the window height: >
+If you want the Var window shown by default, set the "variables_window" flag
+to 1. the "variables_window_height" entry can be used to set the window
+height: >
let g:termdebug_config['variables_window'] = 1
let g:termdebug_config['variables_window_height'] = 15
If there is no g:termdebug_config you can use: >
From https://github.com/vim-jp/vimdoc-ja-working/pull/1315#discussion_r1359111029
ピリオド抜け
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index b19c3067c..cb415baf3 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -184,7 +184,7 @@ introduce Y2K problems, but those are not really part of Vim itself.
==============================================================================
3. Credits *credits* *author*
-Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
+Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|.
Parts of the documentation come from several Vi manuals, written by:
W.N. Joy
From https://github.com/vim-jp/vimdoc-ja-working/pull/1334
80桁超え
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 4ee889003..ec2e3fdec 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -449,7 +449,8 @@ m *+python/dyn* Python 2 interface |python-dynamic| |/dyn|
m *+python3* Python 3 interface |python|
m *+python3/dyn* Python 3 interface |python-dynamic| |/dyn|
m *+python3/dyn-stable*
- Python 3 interface |python-dynamic| |python-stable| |/dyn|
+ Python 3 interface |python-dynamic| |python-stable|
+ |/dyn|
N *+quickfix* |:make| and |quickfix| commands
N *+reltime* |reltime()| function, 'hlsearch'/'incsearch' timeout,
'redrawtime' option
From https://github.com/vim-jp/vimdoc-ja-working/pull/1339
80桁超え、ピリオド忘れ、コロン&コンマ忘れ
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6f38bc02b..a5c58ff33 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5747,7 +5747,7 @@ A jump table for the options with a short description can be found at |Q_op|.
The 'mousemodel' option is set by the |:behave| command.
- *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
+ *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
'mousemoveevent' 'mousemev' boolean (default off)
global
{only works in the GUI}
@@ -7996,7 +7996,7 @@ A jump table for the options with a short description can be found at |Q_op|.
This option controls the behavior when switching between buffers.
This option is checked, when
- jumping to errors with the |quickfix| commands (|:cc|, |:cn|, |:cp|,
- etc.)
+ etc.).
- jumping to a tag using the |:stag| command.
- opening a file using the |CTRL-W_f| or |CTRL-W_F| command.
- jumping to a buffer using a buffer split command (e.g. |:sbuffer|,
@@ -8973,10 +8973,10 @@ A jump table for the options with a short description can be found at |Q_op|.
displayed when 'verbosefile' is set.
*'viewdir'* *'vdir'*
-'viewdir' 'vdir' string (default for Amiga "home:vimfiles/view",
+'viewdir' 'vdir' string (default for Amiga: "home:vimfiles/view",
for Win32: "$HOME/vimfiles/view",
for Unix: "$HOME/.vim/view",
- for macOS: "$VIM/vimfiles/view"
+ for macOS: "$VIM/vimfiles/view",
for VMS: "sys$login:vimfiles/view")
global
{not available when compiled without the |+mksession|
コメント開始桁を揃えた。
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index cb4c67683..35c6b25b9 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -744,8 +744,8 @@ For Windows Terminal you can use something like this: >
let &t_SI = "\e[5 q" " blink bar
let &t_SR = "\e[3 q" " blink underline
let &t_EI = "\e[1 q" " blink block
- let &t_ti ..= "\e[1 q" " blink block
- let &t_te ..= "\e[0 q" " default (depends on terminal, normally blink block)
+ let &t_ti ..= "\e[1 q" " blink block
+ let &t_te ..= "\e[0 q" " default (depends on terminal, normally blink block)
endif
{not available when compiled without the |+cursorshape| feature}
From https://github.com/vim-jp/vimdoc-ja-working/pull/1340
スペース→タブ
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 996f0fbba..a8090f0c8 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4008,8 +4008,8 @@ getqflist([{what}]) *getqflist()*
text description of the error
type type of the error, 'E', '1', etc.
valid |TRUE|: recognized error message
- user_data
- custom data associated with the item, can be
+ user_data
+ custom data associated with the item, can be
any type.
When there is no error list or it's empty, an empty list is
from https://github.com/vim-jp/vimdoc-ja-working/pull/1360
80桁超え
diff --git a/runtime/doc/vim9class.txt b/runtime/doc/vim9class.txt
index 505cbe62f..7c0fed6ae 100644
--- a/runtime/doc/vim9class.txt
+++ b/runtime/doc/vim9class.txt
@@ -402,7 +402,7 @@ class, for which objects can be created. Example: >
An abstract class is defined the same way as a normal class, except that it
does not have any new() method. *E1359*
- *abstract-method* *E1371* *E1372*
+ *abstract-method* *E1371* *E1372*
An abstract method can be defined in an abstract class by using the "abstract"
prefix when defining the method: >
from https://github.com/vim-jp/vimdoc-ja-working/pull/1365
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 996f0fbba..e98d72777 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6793,96 +6793,96 @@ printf({fmt}, {expr1} ...) *printf()*
having a different word order, positional arguments may be
used to indicate this. For instance: >
- #, c-format
- msgid "%s returning %s"
- msgstr "waarde %2$s komt terug van %1$s"
+ #, c-format
+ msgid "%s returning %s"
+ msgstr "waarde %2$s komt terug van %1$s"
<
- In this example, the sentence has its 2 string arguments reversed
- in the output. >
+ In this example, the sentence has its 2 string arguments
+ reversed in the output. >
- echo printf(
- "In The Netherlands, vim's creator's name is: %1$s %2$s",
- "Bram", "Moolenaar")
-< In The Netherlands, vim's creator's name is: Bram Moolenaar >
+ echo printf(
+ "In The Netherlands, vim's creator's name is: %1$s %2$s",
+ "Bram", "Moolenaar")
+< In The Netherlands, vim's creator's name is: Bram Moolenaar >
- echo printf(
- "In Belgium, vim's creator's name is: %2$s %1$s",
- "Bram", "Moolenaar")
-< In Belgium, vim's creator's name is: Moolenaar Bram
+ echo printf(
+ "In Belgium, vim's creator's name is: %2$s %1$s",
+ "Bram", "Moolenaar")
+< In Belgium, vim's creator's name is: Moolenaar Bram
Width (and precision) can be specified using the '*' specifier.
In this case, you must specify the field width position in the
argument list. >
- echo printf("%1$*2$.*3$d", 1, 2, 3)
-< 001 >
- echo printf("%2$*3$.*1$d", 1, 2, 3)
-< 2 >
- echo printf("%3$*1$.*2$d", 1, 2, 3)
-< 03 >
- echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
-< 1.414
+ echo printf("%1$*2$.*3$d", 1, 2, 3)
+< 001 >
+ echo printf("%2$*3$.*1$d", 1, 2, 3)
+< 2 >
+ echo printf("%3$*1$.*2$d", 1, 2, 3)
+< 03 >
+ echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+< 1.414
You can mix specifying the width and/or precision directly
and via positional arguments: >
- echo printf("%1$4.*2$f", 1.4142135, 6)
-< 1.414214 >
- echo printf("%1$*2$.4f", 1.4142135, 6)
-< 1.4142 >
- echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
-< 1.41
+ echo printf("%1$4.*2$f", 1.4142135, 6)
+< 1.414214 >
+ echo printf("%1$*2$.4f", 1.4142135, 6)
+< 1.4142 >
+ echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+< 1.41
*E1500*
You cannot mix positional and non-positional arguments: >
- echo printf("%s%1$s", "One", "Two")
-< E1500: Cannot mix positional and non-positional
- arguments: %s%1$s
+ echo printf("%s%1$s", "One", "Two")
+< E1500: Cannot mix positional and non-positional arguments:
+ %s%1$s
*E1501*
You cannot skip a positional argument in a format string: >
- echo printf("%3$s%1$s", "One", "Two", "Three")
-< E1501: format argument 2 unused in $-style
- format: %3$s%1$s
+ echo printf("%3$s%1$s", "One", "Two", "Three")
+< E1501: format argument 2 unused in $-style format:
+ %3$s%1$s
*E1502*
You can re-use a [field-width] (or [precision]) argument: >
- echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
-< 1 at width 2 is: 01
+ echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+< 1 at width 2 is: 01
However, you can't use it as a different type: >
- echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
-< E1502: Positional argument 2 used as field
- width reused as different type: long int/int
+ echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+< E1502: Positional argument 2 used as field width reused as
+ different type: long int/int
*E1503*
When a positional argument is used, but not the correct number
or arguments is given, an error is raised: >
- echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
-< E1503: Positional argument 3 out of bounds:
- %1$d at width %2$d is: %01$*2$.*3$d
+ echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+< E1503: Positional argument 3 out of bounds: %1$d at width
+ %2$d is: %01$*2$.*3$d
Only the first error is reported: >
- echo printf("%01$*2$.*3$d %4$d", 1, 2)
-< E1503: Positional argument 3 out of bounds:
- %01$*2$.*3$d %4$d
+ echo printf("%01$*2$.*3$d %4$d", 1, 2)
+< E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
+ %4$d
*E1504*
A positional argument can be used more than once: >
- echo printf("%1$s %2$s %1$s", "One", "Two")
-< One Two One
+ echo printf("%1$s %2$s %1$s", "One", "Two")
+< One Two One
However, you can't use a different type the second time: >
- echo printf("%1$s %2$s %1$d", "One", "Two")
-< E1504: Positional argument 1 type used
- inconsistently: int/string
+ echo printf("%1$s %2$s %1$d", "One", "Two")
+< E1504: Positional argument 1 type used inconsistently:
+ int/string
*E1505*
Various other errors that lead to a format string being
wrongly formatted lead to: >
- 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
+ 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
@@ -10177,8 +10177,8 @@ type({expr}) The result is a Number representing the type of {expr}.
Job: 8 |v:t_job|
Channel: 9 |v:t_channel|
Blob: 10 |v:t_blob|
- Class 12 |v:t_class|
- Object 13 |v:t_object|
+ Class: 12 |v:t_class|
+ Object: 13 |v:t_object|
For backward compatibility, this method can be used: >
:if type(myvar) == type(0)
:if type(myvar) == type("")
from https://github.com/vim-jp/vimdoc-ja-working/pull/1372
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c91145ce7..a96356bba 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4809,12 +4809,12 @@ Vim comes bundled with a Vim script library, that can be used by runtime,
script authors. Currently, it only includes very few functions, but it may
grow over time.
-The functions are available as |Vim9-script| as well as using legacy vim
+The functions are available as |Vim9-script| as well as using legacy Vim
script (to be used for non Vim 9.0 versions and Neovim).
*dist#vim* *dist#vim9*
-The functions make use of the autoloaded prefix "dist#vim" (for legacy Vim script and
-Neovim) and "dist#vim9" for Vim9 script.
+The functions make use of the autoloaded prefix "dist#vim" (for legacy Vim
+script and Neovim) and "dist#vim9" for Vim9 script.
The following functions are available:
builtin.txt
その他で使われている表記に修正)2.
の1つ目の行末の ;
を .
に変更。diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index b246fcbce..0f5884b65 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1265,7 +1265,7 @@ level. They cannot be created in a function, also not in a legacy function.
yet. This will report any errors found during
compilation.
-:defc[ompile] MyClass Compile all methods in a class |class-compile|.
+:defc[ompile] MyClass Compile all methods in a class. |class-compile|
:defc[ompile] {func}
:defc[ompile] debug {func}
@@ -1720,8 +1720,8 @@ an example for each category: >
Vim does not have a familiar null value; it has various null_<type> predefined
values, for example |null_string|, |null_list|, |null_job|. Primitives do not
have a null_<type>. The typical use cases for null_<type> are:
-- to `clear a variable` and release its resources;
-- as a `default for a parameter` in a function definition, see |null-compare|.
+- to clear a variable and release its resources;
+- as a default for a parameter in a function definition, see |null-compare|.
For a specialized variable, like `job`, null_<type> is used to clear the
resources. For a container variable, resources can also be cleared by
@@ -1773,7 +1773,7 @@ an empty container, do not use null_<type> in a comparison: >
F(null_list) # output: "null"
F([]) # output: "not null, empty"
F(['']) # output: "not null, not empty"
-The above function takes a `list of strings` and reports on it.
+The above function takes a list of strings and reports on it.
Change the above function signature to accept different types of arguments: >
def F(arg: list<any> = null_list) # any type of list
def F(arg: any = null) # any type
@@ -1791,18 +1791,18 @@ with vim9 null semantics, the programmer may chose to use null_<type> in
comparisons and/or other situations.
Elsewhere in the documentation it says:
- Quite often a null value is handled the same as an
- empty value, but not always
+ Quite often a null value is handled the same as an empty value, but
+ not always
Here's an example: >
vim9script
var s1: list<string>
var s2: list<string> = null_list
echo s1 # output: "[]"
echo s2 # output: "[]"
-
+
echo s1 + ['a'] # output: "['a']"
echo s2 + ['a'] # output: "['a']"
-
+
echo s1->add('a') # output: "['a']"
echo s2->add('a') # E1130: Can not add to null list
<
Vim 9.1.113 です。:const
でも :let-heredoc
の eval は使えるので、こちらにもあって良いと思います。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index e3a9f2013..929fdf357 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3091,7 +3091,7 @@ text...
:cons[t] {var-name} = {expr1}
:cons[t] [{name1}, {name2}, ...] = {expr1}
:cons[t] [{name}, ..., ; {lastname}] = {expr1}
-:cons[t] {var-name} =<< [trim] {marker}
+:cons[t] {var-name} =<< [trim] [eval] {marker}
text...
text...
{marker}
Typoと .
漏れと80桁超え。
(typoは先に本家の方にコメントしちゃった)
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 442285dc8..fcd402c02 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -235,7 +235,7 @@ test_mswin_event({event}, {args}) *test_mswin_event()*
"mouse" mouse event.
"key" keyboard event.
"set_keycode_trans_strategy"
- Change the key transation method
+ Change the key translation method.
"mouse":
Inject either a mouse button click, or a mouse move, event.
@@ -294,7 +294,8 @@ test_mswin_event({event}, {args}) *test_mswin_event()*
"set_keycode_trans_strategy":
|w32-experimental-keycode-trans-strategy|
- Switch the keycode translation method. The supported methods are:
+ Switch the keycode translation method. The supported methods
+ are:
experimental: The method used after Patch v8.2.4807
using ToUnicode() Win API call.
classic: The method used pre Patch v8.2.4807
version9.txt の目次 後から追加かもしれないので、送るかは別で記載
diff --git runtime/doc/version9.txt runtime/doc/version9.txt
index 7b9a3664a..a441e519a 100644
--- runtime/doc/version9.txt
+++ runtime/doc/version9.txt
@@ -34,6 +34,11 @@ Changed |changed-9.1|
Added |added-9.1|
Patches |patches-9.1|
+VERSION 9.2 |version-9.2|
+Changed |changed-9.2|
+Added |added-9.2|
+Patches |patches-9.2|
+
See |vi_diff.txt| for an overview of differences between Vi and Vim 9.0.
See |version4.txt|, |version5.txt|, |version6.txt|, |version7.txt| and
コードブロックが閉じられておらず、下のモードラインの行もコードブロックとしてハイライトされてしまっているため、ちゃんとコードブロックを閉じておいた方が良さそうだなと。
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index fe24505ed..2e57423fb 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1261,5 +1261,5 @@ By default, the yaml indent script does not try to detect multiline scalars.
If you want to enable this, set the following variable: >
let g:yaml_indent_multiline_scalar = 1
-
+<
vim:tw=78:ts=8:noet:ft=help:norl:
文頭ではないので、"GVim" ではなく "gVim" 表記の方が良さそうです。参考: https://github.com/vim/vim/blob/f6272551bdae3f265b6948a4155b079c37fe110f/runtime/doc/intro.txt#L46-L47
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 12297261c..05ce97420 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -989,7 +989,7 @@ in Insert mode: >
1.12 MAPPING SUPER-KEYS or COMMAND-KEYS *:map-super-keys* *:map-cmd-key*
The Super modifier is available in GUI mode (when |gui_running| is 1) for
-GVim on Linux and MacVim on Mac OS. If you're on a Mac, this represents the
+gVim on Linux and MacVim on Mac OS. If you're on a Mac, this represents the
Command key, on Linux with the GTK GUI it represents the Super key.
The character "D" is used for the Super / Command modifier.
文末のピリオド忘れと思われます。
diff --git a/en/builtin.txt b/en/builtin.txt
index ec702201..4ec9fe05 100644
--- a/en/builtin.txt
+++ b/en/builtin.txt
@@ -2543,7 +2543,7 @@ expand({string} [, {nosuf} [, {list}]]) *expand()*
not start with '%', '#' or '<', see below.
For a |:terminal| window '%' expands to a '!' followed by
- the command or shell that is run |terminal-bufname|
+ the command or shell that is run. |terminal-bufname|
When {string} starts with '%', '#' or '<', the expansion is
done like for the |cmdline-special| variables with their
From https://github.com/vim-jp/vimdoc-ja-working/pull/1475 他に倣ってピリオドなし。
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 32094b398..af5e36226 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -429,7 +429,7 @@ Name triggered by ~
|SessionLoadPost| after loading a session file
|SessionWritePost| After writing the session file using
- the |:mksession| command.
+ the |:mksession| command
|MenuPopup| just before showing the popup menu
|CompleteChanged| after Insert mode completion menu changed
他に倣ってピリオドなし。
文頭の After も after にした方がよいかもしれません。
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -32090,7 +32090,7 @@ Solution: Store the text column when d
Patch 9.0.0049
Problem: Csv and tsv files are not recognized.
-Solution: Add patterns fo csv and tsv files. (Leandro Lourenci,
+Solution: Add patterns for csv and tsv files. (Leandro Lourenci,
closes #10680)
Patch 9.0.0050
@@ -40641,7 +40641,7 @@ Solution: Use the class-related grow a
Patch 9.0.1989
Problem: Vim9: double error message given
-Solution: Only give second error message, if ther
+Solution: Only give second error message, if there
wasn't one given before
Patch 9.0.1990
@@ -40687,7 +40687,7 @@ Solution: Mention the defining class f
Patch 9.0.2000
Problem: Vim9: use-after-free in deep call stack
-Solution: Get the objct pointer from execution stack
+Solution: Get the object pointer from execution stack
Patch 9.0.2001
Problem: Vim9: segfault with islocked()
syntax.txt で小見出しが効いてない、おそらく期待してるのは効くほうだと思うので修正 (TeXとかも大文字書きしてるので、ただTitle Caseしちゃったのだと思う)
追記: HTML/OS (by Aestiva) とかあるから、そうでもない...?
Vim 9.1.0380
diff --git runtime/doc/syntax.txt runtime/doc/syntax.txt
index bfc464534..125483e42 100644
--- runtime/doc/syntax.txt
+++ runtime/doc/syntax.txt
@@ -946,7 +946,7 @@ Enables Stylus for ".astro" files. Default Value: "disable"
NOTE: You need to install an external plugin to support stylus in astro files.
-ASPPERL and ASPVBS *ft-aspperl-syntax* *ft-aspvbs-syntax*
+ASPPERL AND ASPVBS *ft-aspperl-syntax* *ft-aspvbs-syntax*
*.asp and *.asa files could be either Perl or Visual Basic script. Since it's
hard to detect this you can set two global variables to tell Vim what you are
s/R/r/
:helpg FuncRef@en
するとここ以外は、例中の関数名とversion[89].txtの履歴だけなので、Funcref
が正しいと判断。
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index cd3d6add4..25b028a50 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1346,7 +1346,7 @@ The expression must evaluate to a String. A Number is always automatically
converted to a String. For the "p" and ":put" command, if the result is a
Float it's converted into a String. If the result is a List each element is
turned into a String and used as a line. A Dictionary is converted into a
-String. A FuncRef results in an error message (use string() to convert).
+String. A Funcref results in an error message (use string() to convert).
If the "= register is used for the "p" command, the String is split up at <NL>
characters. If the String ends in a <NL>, it is regarded as a linewise
空白→タブ
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b83a61e00..3f2a1d5ef 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -104,9 +104,9 @@ rvim vim -Z Like "vim", but in restricted mode (see |-Z|) *rvim*
rview vim -RZ Like "view", but in restricted mode. *rview*
rgvim vim -gZ Like "gvim", but in restricted mode. *rgvim*
rgview vim -RgZ Like "gview", but in restricted mode. *rgview*
-evim vim -y Easy Vim: set 'insertmode' (see |-y|) *evim*
-eview vim -yR Like "evim" in read-only mode *eview*
-vimdiff vim -d Start in diff mode |diff-mode|
+evim vim -y Easy Vim: set 'insertmode' (see |-y|) *evim*
+eview vim -yR Like "evim" in read-only mode *eview*
+vimdiff vim -d Start in diff mode |diff-mode|
gvimdiff vim -gd Start in diff mode |diff-mode|
Additional characters may follow, they are ignored. For example, you can have
@@ -812,7 +812,7 @@ accordingly. Vim proceeds in this order:
Places for your personal initializations:
Unix $HOME/.vimrc, $HOME/.vim/vimrc
- or $XDG_CONFIG_HOME/vim/vimrc
+ or $XDG_CONFIG_HOME/vim/vimrc
MS-Windows $HOME/_vimrc, $HOME/vimfiles/vimrc
or $VIM/_vimrc
Amiga s:.vimrc, home:.vimrc, home:vimfiles:vimrc
From https://github.com/vim-jp/vimdoc-ja-working/pull/new/hh-update-starting
'~'
はそれだけでリンクになるので、|~|
で囲む必要はない。
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b83a61e00..b16fa38e5 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1119,7 +1119,7 @@ feature backward compatible). However, if you want to migrate to use
and `~/.vim/vimrc` file.
*xdg-runtime*
-When the |xdg-vimrc| is used the |'runtimepath'| will be modified accordingly
+When the |xdg-vimrc| is used the 'runtimepath' will be modified accordingly
to respect the |xdg-base-dir|: >
"$XDG_CONFIG_HOME/vim,$VIMRUNTIME,/after,$XDG_CONFIG_HOME/vim/after"
(2024/05/05) 修正されてた。
From https://github.com/vim-jp/vimdoc-ja-working/pull/1507 80桁越えを修正
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 1256d750d..cdf80c23b 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -382,8 +382,8 @@ The options are listed below. The associated termcap code is always equal to
the last two characters of the option name. Only one termcap code is
required: Cursor motion, 't_cm'.
-The options 't_da', 't_db', 't_ms', 't_xs', 't_xn', 't_xo' represent flags in the
-termcap. When the termcap flag is present, the option will be set to "y".
+The options 't_da', 't_db', 't_ms', 't_xs', 't_xn', 't_xo' represent flags in
+the termcap. When the termcap flag is present, the option will be set to "y".
But any non-empty string means that the flag is set. An empty string means
that the flag is not set. 't_CS' works like this too, but it isn't a termcap
flag.
ここまでをPRed. https://github.com/vim/vim/pull/14720
From https://github.com/vim-jp/vimdoc-ja-working/pull/1521
.
抜け。
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index f0c1d74d4..e6661df08 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1335,7 +1335,7 @@ passed to make, say :make html or :make pdf.
Additional arguments can be passed to pandoc:
- either by appending them to make, say `:make html --self-contained` .
-- or setting them in `b:pandoc_compiler_args` or `g:pandoc_compiler_args`
+- or setting them in `b:pandoc_compiler_args` or `g:pandoc_compiler_args`.
PERL *quickfix-perl* *compiler-perl*
From https://github.com/vim-jp/vimdoc-ja-working/pull/1528 必要な空白が消されたので復活。 (https://github.com/vim/vim/commit/1c5728e0c4a9df930879f9f0ca108092d5902194#diff-b5ce8ea08d78c0baef6b22f54deb0c81f940d56c6d8cf651b29ce950e9367568L803-R804)
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index e38c30cb1..75b5120a1 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -801,7 +801,7 @@ is suitable for complex input, such as CJK.
number of Hira-gana characters are 76. So, first, we pre-input text as
pronounced in Hira-gana, second, we convert Hira-gana to Kanji or Kata-Kana,
if needed. There are some Kana-Kanji conversion server: jserver
- (distributed with Wnn, see below) and canna.Canna can be found at:
+ (distributed with Wnn, see below) and canna. Canna can be found at:
https://osdn.net/projects/canna/
There is a good input system: Wnn4.2. Wnn 4.2 contains,
小見出しの記法が不十分な箇所の対応
diff --git runtime/doc/mbyte.txt runtime/doc/mbyte.txt
index e38c30cb1..c2d7ded54 100644
--- runtime/doc/mbyte.txt
+++ runtime/doc/mbyte.txt
@@ -1356,7 +1356,7 @@ You might also want to select the font used for the menus. Unfortunately this
doesn't always work. See the system specific remarks below, and 'langmenu'.
-USING UTF-8 IN X-Windows *utf-8-in-xwindows*
+USING UTF-8 IN X-WINDOWS *utf-8-in-xwindows*
Note: This section does not apply to the GTK+ 2 GUI.
diff --git runtime/doc/syntax.txt runtime/doc/syntax.txt
index 0c2ecaef5..9ef130ded 100644
--- runtime/doc/syntax.txt
+++ runtime/doc/syntax.txt
@@ -1909,7 +1909,7 @@ Note: Syntax folding might slow down syntax highlighting significantly,
especially for large files.
-HTML/OS (by Aestiva) *htmlos.vim* *ft-htmlos-syntax*
+HTML/OS (BY AESTIVA) *htmlos.vim* *ft-htmlos-syntax*
The coloring scheme for HTML/OS works as follows:
ただ HTML/OS (BY AESTIVA) には / があるので、ハイライトされてない...
From https://github.com/vim-jp/vimdoc-ja-working/pull/1552 ファイル追加しといてindexに追加忘れてる。
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 7109bae54..c3352e26c 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -163,6 +163,7 @@ Programming language support ~
|quickfix.txt| commands for a quick edit-compile-fix cycle
|ft_ada.txt| Ada (the programming language) support
|ft_context.txt| Filetype plugin for ConTeXt
+|ft_hare.txt| Filetype plugin for Hare
|ft_mp.txt| Filetype plugin for METAFONT and MetaPost
|ft_ps1.txt| Filetype plugin for Windows PowerShell
|ft_raku.txt| Filetype plugin for Raku
単独でPR: https://github.com/vim/vim/pull/14863 → merge済み
From https://github.com/vim-jp/vimdoc-ja-working/pull/1556
typo. s/con\zs\zeealed/c/
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 0c2ecaef5..fb8148a8b 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4359,7 +4359,7 @@ the region, but not the contents of the region, are marked as concealable.
Whether or not they are actually concealed depends on the setting on the
'conceallevel' option. The ends of a region can only be concealed separately
in this way when they have their own highlighting via "matchgroup". The
-|synconcealed()| function can be used to retrieve information about conealed
+|synconcealed()| function can be used to retrieve information about concealed
items.
cchar *:syn-cchar*
From https://github.com/vim-jp/vimdoc-ja-working/pull/1556
コードの説明 → コード
の順になっているのでそれに合わせた。s/Vim9\zs-\zescript/ /
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 9161130a3..495c4a7cc 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -935,13 +935,14 @@ ASTRO *astro.vim* *ft-astro-syntax*
Configuration
The following variables control certain syntax highlighting features.
-You can add them to your .vimrc: >
+You can add them to your .vimrc:
+
+Enables TypeScript and TSX for ".astro" files. Default Value: "disable" >
let g:astro_typescript = "enable"
<
-Enables TypeScript and TSX for ".astro" files. Default Value: "disable" >
+Enables Stylus for ".astro" files. Default Value: "disable" >
let g:astro_stylus = "enable"
<
-Enables Stylus for ".astro" files. Default Value: "disable"
NOTE: You need to install an external plugin to support stylus in astro files.
@@ -3821,7 +3822,7 @@ Some folding is now supported with syntax/vim.vim: >
g:vimsyn_folding =~ 'a' : augroups
g:vimsyn_folding =~ 'f' : fold functions
g:vimsyn_folding =~ 'h' : fold heredocs
- g:vimsyn_folding =~ 'H' : fold Vim9-script legacy headers
+ g:vimsyn_folding =~ 'H' : fold Vim9 script legacy headers
g:vimsyn_folding =~ 'l' : fold lua script
g:vimsyn_folding =~ 'm' : fold mzscheme script
g:vimsyn_folding =~ 'p' : fold perl script
From https://github.com/vim-jp/vimdoc-ja-working/pull/1557
52.6章のhighlight-yank プラグインのサンプルコードはインデントを整理したほうが良いと思う。 (各行頭タブ1つで以降は2スペースインデント?)
diff --git a/runtime/doc/usr_52.txt b/runtime/doc/usr_52.txt
index 553ed88cf..b17e171d6 100644
--- a/runtime/doc/usr_52.txt
+++ b/runtime/doc/usr_52.txt
@@ -356,21 +356,21 @@ and it will be active next time you start Vim |add-plugin|: >
def HighlightedYank(hlgroup = 'IncSearch', duration = 300, in_visual = true)
if v:event.operator ==? 'y'
- if !in_visual && visualmode() != null_string
- visualmode(1)
- return
- endif
- var [beg, end] = [getpos("'["), getpos("']")]
- var type = v:event.regtype ?? 'v'
- var pos = getregionpos(beg, end, {type: type})
- var end_offset = (type == 'V' || v:event.inclusive) ? 1 : 0
- var m = matchaddpos(hlgroup, pos->mapnew((_, v) => {
- var col_beg = v[0][2] + v[0][3]
- var col_end = v[1][2] + v[1][3] + end_offset
- return [v[0][1], col_beg, col_end - col_beg]
- }))
- var winid = win_getid()
- timer_start(duration, (_) => m->matchdelete(winid))
+ if !in_visual && visualmode() != null_string
+ visualmode(1)
+ return
+ endif
+ var [beg, end] = [getpos("'["), getpos("']")]
+ var type = v:event.regtype ?? 'v'
+ var pos = getregionpos(beg, end, {type: type})
+ var end_offset = (type == 'V' || v:event.inclusive) ? 1 : 0
+ var m = matchaddpos(hlgroup, pos->mapnew((_, v) => {
+ var col_beg = v[0][2] + v[0][3]
+ var col_end = v[1][2] + v[1][3] + end_offset
+ return [v[0][1], col_beg, col_end - col_beg]
+ }))
+ var winid = win_getid()
+ timer_start(duration, (_) => m->matchdelete(winid))
endif
enddef
- Vimのhelpは基本的に
コードの説明 → コード
の順になっているのでそれに合わせた。
順を変えるのであれば、文も修正が必要だと思います。 To enable hogehoge: 等。(その場合、Default Valueをどこに書くかが悩ましいですが。) 文頭が Enables で始まっているのは、ある意味、コードブロックを主語としていると考えることができそうです。
From https://github.com/vim-jp/vimdoc-ja-working/pull/1557#discussion_r1623758040
.
で区切る。その方が日本語でもタグを後置できるので。diff --git a/runtime/doc/usr_52.txt b/runtime/doc/usr_52.txt
index 553ed88cf..1ddddd06e 100644
--- a/runtime/doc/usr_52.txt
+++ b/runtime/doc/usr_52.txt
@@ -341,7 +341,7 @@ will have to make sure to use a unique name for these global items. Example: >
COMMENT PACKAGE
-Vim comes with a comment plugin, written in Vim9 script |comment-install|.
+Vim comes with a comment plugin, written in Vim9 script. |comment-install|
Have a look at the package located at $VIMRUNTIME/pack/dist/opt/comment/
HIGHLIGHT YANK PLUGIN
@@ -350,7 +350,7 @@ Here is an example for highlighting the yanked region. It makes use of the
|getregionpos()| function, available since Vim 9.1.0446.
Copy the following example into a new file and place it into your plugin directory
-and it will be active next time you start Vim |add-plugin|: >
+and it will be active next time you start Vim. |add-plugin|: >
vim9script
ここまでをPRed. https://github.com/vim/vim/pull/14942
From https://github.com/vim-jp/vimdoc-ja-working/pull/1568
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 6edb8891b..f5c488d9e 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -31694,7 +31694,7 @@ The release 9.1 is dedicated to Vim's Benevolent dictator for life
This release has hundreds of bug fixes, there are a few new features and there
are many minor improvements.
-Vim9 classes
+Vim9 classes ~
------------
Support for classes and objects in a Vim9 script are added. This is described
in |vim9-class|. The following features are supported:
本家help(runtime/doc/*.txt)のtypoを報告するスレです。 その都度vim_devに報告するとウザいのである程度溜まってから報告します。
typo発見時のVimバージョン(9.0.xxxx)も添えていただけると助かります。
関連: #1172, #1321