Update runtime files
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index c1aee0e..96a0e4b 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 8.2. Last change: 2021 Nov 20
+*autocmd.txt* For Vim version 8.2. Last change: 2022 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -51,10 +51,10 @@
2. Defining autocommands *autocmd-define*
*:au* *:autocmd*
-:au[tocmd] [group] {event} {pat} [++once] [++nested] {cmd}
+:au[tocmd] [group] {event} {aupat} [++once] [++nested] {cmd}
Add {cmd} to the list of commands that Vim will
execute automatically on {event} for a file matching
- {pat} |autocmd-patterns|.
+ {aupat} |autocmd-patterns|.
Here {event} cannot be "*". *E1155*
Note: A quote character is seen as argument to the
:autocmd and won't start a comment.
@@ -145,19 +145,19 @@
==============================================================================
3. Removing autocommands *autocmd-remove*
-:au[tocmd]! [group] {event} {pat} [++once] [++nested] {cmd}
+:au[tocmd]! [group] {event} {aupat} [++once] [++nested] {cmd}
Remove all autocommands associated with {event} and
- {pat}, and add the command {cmd}.
+ {aupat}, and add the command {cmd}.
See |autocmd-once| for [++once].
See |autocmd-nested| for [++nested].
-:au[tocmd]! [group] {event} {pat}
+:au[tocmd]! [group] {event} {aupat}
Remove all autocommands associated with {event} and
- {pat}.
+ {aupat}.
-:au[tocmd]! [group] * {pat}
- Remove all autocommands associated with {pat} for all
- events.
+:au[tocmd]! [group] * {aupat}
+ Remove all autocommands associated with {aupat} for
+ all events.
:au[tocmd]! [group] {event}
Remove ALL autocommands for {event}.
@@ -177,12 +177,12 @@
==============================================================================
4. Listing autocommands *autocmd-list*
-:au[tocmd] [group] {event} {pat}
+:au[tocmd] [group] {event} {aupat}
Show the autocommands associated with {event} and
- {pat}.
+ {aupat}.
-:au[tocmd] [group] * {pat}
- Show the autocommands associated with {pat} for all
+:au[tocmd] [group] * {aupat}
+ Show the autocommands associated with {aupat} for all
events.
:au[tocmd] [group] {event}
@@ -1311,16 +1311,16 @@
Before a WinEnter event.
==============================================================================
-6. Patterns *autocmd-patterns* *{pat}*
+6. Patterns *autocmd-patterns* *{aupat}*
-The {pat} argument can be a comma separated list. This works as if the
-command was given with each pattern separately. Thus this command: >
+The {aupat} argument of `:autocmd` can be a comma separated list. This works as
+if the command was given with each pattern separately. Thus this command: >
:autocmd BufRead *.txt,*.info set et
Is equivalent to: >
:autocmd BufRead *.txt set et
:autocmd BufRead *.info set et
-The file pattern {pat} is tested for a match against the file name in one of
+The file pattern {aupat} is tested for a match against the file name in one of
two ways:
1. When there is no '/' in the pattern, Vim checks for a match against only
the tail part of the file name (without its leading directory path).
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9029685..3850b38 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt* For Vim version 8.2. Last change: 2022 Jan 08
+*builtin.txt* For Vim version 8.2. Last change: 2022 Jan 16
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index ebb78b0..4f217fd 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 8.2. Last change: 2021 Dec 27
+*editing.txt* For Vim version 8.2. Last change: 2022 Jan 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1388,7 +1388,8 @@
command has not been used stick to the global or tab-local current directory.
When jumping to another window the current directory is changed to the last
specified local current directory. If none was specified, the global or
-tab-local current directory is used.
+tab-local current directory is used. When creating a new window it inherits
+the local directory of the current window.
When a |:tcd| command has been used for a tab page, the specified directory
becomes the current directory for the current tab page and the current window.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 1072d56..2727a4c 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 8.2. Last change: 2022 Jan 03
+*map.txt* For Vim version 8.2. Last change: 2022 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -270,7 +270,7 @@
endfunc
nnoremap <expr> <F3> <SID>OpenPopup()
-Also, keep in mind that the expression may be evaluated when looking for
+Keep in mind that the expression may be evaluated when looking for
typeahead, before the previous command has been executed. For example: >
func StoreColumn()
let g:column = col('.')
@@ -353,7 +353,7 @@
in a plugin using an autoload script: >
vim9script
import autoload 'implementation.vim' as impl
- nnoremap <silent> <F4> <ScriptCmd>impl.DoTheWork()<CR>
+ nnoremap <F4> <ScriptCmd>impl.DoTheWork()<CR>
No matter where <F4> is typed, the "impl" import will be found in the script
context of where the mapping was defined. And since it's an autoload import,
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 407c23c..8ea1958 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt* For Vim version 8.2. Last change: 2021 Dec 27
+*repeat.txt* For Vim version 8.2. Last change: 2022 Jan 09
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 78e88f3..8914fc2 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3649,6 +3649,7 @@
<S-xF4> term.txt /*<S-xF4>*
<SID> map.txt /*<SID>*
<SNR> map.txt /*<SNR>*
+<ScriptCmd> map.txt /*<ScriptCmd>*
<ScrollWheelDown> scroll.txt /*<ScrollWheelDown>*
<ScrollWheelLeft> scroll.txt /*<ScrollWheelLeft>*
<ScrollWheelRight> scroll.txt /*<ScrollWheelRight>*
@@ -10278,6 +10279,7 @@
vim7 version7.txt /*vim7*
vim8 version8.txt /*vim8*
vim9 vim9.txt /*vim9*
+vim9-autoload vim9.txt /*vim9-autoload*
vim9-boolean vim9.txt /*vim9-boolean*
vim9-classes vim9.txt /*vim9-classes*
vim9-const vim9.txt /*vim9-const*
@@ -10435,6 +10437,8 @@
win_gotoid() builtin.txt /*win_gotoid()*
win_id2tabwin() builtin.txt /*win_id2tabwin()*
win_id2win() builtin.txt /*win_id2win()*
+win_move_separator() builtin.txt /*win_move_separator()*
+win_move_statusline() builtin.txt /*win_move_statusline()*
win_screenpos() builtin.txt /*win_screenpos()*
win_splitmove() builtin.txt /*win_splitmove()*
winbufnr() builtin.txt /*winbufnr()*
@@ -10617,6 +10621,7 @@
{Visual} intro.txt /*{Visual}*
{address} cmdline.txt /*{address}*
{arglist} editing.txt /*{arglist}*
+{aupat} autocmd.txt /*{aupat}*
{bufname} windows.txt /*{bufname}*
{char1-char2} intro.txt /*{char1-char2}*
{event} autocmd.txt /*{event}*
@@ -10626,7 +10631,6 @@
{motion} intro.txt /*{motion}*
{move-around} visual.txt /*{move-around}*
{offset} pattern.txt /*{offset}*
-{pat} autocmd.txt /*{pat}*
{register} change.txt /*{register}*
{rhs} map.txt /*{rhs}*
{subject} helphelp.txt /*{subject}*
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 3ff1450..0459aa3 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -1,4 +1,4 @@
-*testing.txt* For Vim version 8.2. Last change: 2021 Dec 11
+*testing.txt* For Vim version 8.2. Last change: 2022 Jan 13
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b18effd..851c167 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 8.2. Last change: 2022 Jan 08
+*todo.txt* For Vim version 8.2. Last change: 2022 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,15 +38,15 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Autoload import syntax:
- import autoload "filename"
- import autoload "filename" as name
-doesn't load the script yet
- autoload items can be used without the "#dir#file#" prefix, but file.item
- Add a test_override() item to load the script and compile functions the
- moment it is encountered, so that types are checked.
-"vim9script autoload" in an autoload script, using "export" will prefix
- "dir#file#" to the exported item.
+TODO in eval_method() for using partial.
+
+TODO in compile_load_scriptvar()
+Try using a variable or function that is not exported
+
+"return Msg()" does not give an error if there is no return value. #9497
+
+eval_map_expr() in getchar.c saves stuff because "mp" can change, this does
+not happen in map.c for an abbreviation. Test that this fails, fix it.
Once Vim9 is stable:
- Add all the error numbers in a good place in documentation.
@@ -207,6 +207,8 @@
When using 'cryptmethod' xchaha20 the undo file is not encrypted.
Need to handle extra bytes.
+Some prompts are not translated: #9495
+
Test_communicate_ipv6(): is flaky on many systems
Fails in line 64 of Ch_communicate, no exception is thrown.
@@ -904,9 +906,6 @@
included in the existing fold. Deleting the empty line and undo fixes it.
(Oleg Koshovetc, 2018 Jul 15, #3214)
-Patch to support "xxd -ps". (Erik Auerswald, 2018 May 1)
-Lacks a test.
-
Column number is wrong when using 'linebreak' and 'wrap'. (Keith Smiley, 2018
Jan 15, #2555)
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index a3feeb0..fb0a357 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 8.2. Last change: 2022 Jan 08
+*various.txt* For Vim version 8.2. Last change: 2022 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -570,19 +570,19 @@
:redi[r] END End redirecting messages.
*:filt* *:filter*
-:filt[er][!] {pat} {command}
-:filt[er][!] /{pat}/ {command}
+:filt[er][!] {pattern} {command}
+:filt[er][!] /{pattern}/ {command}
Restrict the output of {command} to lines matching
- with {pat}. For example, to list only xml files: >
+ with {pattern}. For example, to list only xml files: >
:filter /\.xml$/ oldfiles
< If the [!] is given, restrict the output of {command}
- to lines that do NOT match {pat}.
+ to lines that do NOT match {pattern}.
- {pat} is a Vim search pattern. Instead of enclosing
+ {pattern} is a Vim search pattern. Instead of enclosing
it in / any non-ID character (see |'isident'|) can be
- used, so long as it does not appear in {pat}. Without
- the enclosing character the pattern cannot include the
- bar character. 'ignorecase' is not used.
+ used, so long as it does not appear in {pattern}.
+ Without the enclosing character the pattern cannot
+ include the bar character. 'ignorecase' is not used.
The pattern is matched against the relevant part of
the output, not necessarily the whole line. Only some
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/vim-ja.UTF-8.1
index 363922b..8751391 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/vim-ja.UTF-8.1
@@ -166,7 +166,7 @@
.TP
\-d
差分モードで起動します。
-二つか三つの四つのファイルを引数に指定してください。
+2 個から 8 個のファイルを引数に指定してください。
指定されたファイルが開かれ、それらのファイルの差分が表示されます。
vimdiff(1) と同様の動作です。
.TP
@@ -217,8 +217,7 @@
サポートされていない場合はエラーメッセージを表示して終了します。
.TP
\-i {viminfo}
-viminfo ファイルを使う設定になっている場合は、初期設定の "~/.viminfo"
-の代わりに、指定されたファイルを設定します。
+初期設定の "~/.viminfo" の代わりに、viminfo ファイルを読み書きする際に使うファイル名を指定します。
"NONE" を指定すると、.viminfo ファイルを使わないように設定できます。
.TP
\-L
@@ -356,6 +355,10 @@
これ以降の引数はすべてファイル名として扱われます。
ファイル名が '\-' で始まっているファイルを開くときに使ってください。
.TP
+\-\-clean
+一切の個人設定 (vimrc、プラグイン、その他) を使用しません。
+ある問題がクリーンな Vim セットアップで再現するかを確認するのに有用です。
+.TP
\-\-echo\-wid
GTK GUI のみ: Window ID を標準出力に出力します。
.TP
@@ -398,6 +401,9 @@
\-\-socketid {id}
GTK GUI のみ: GtkPlug メカニズムを使って gvim を別のウィンドウの中で実行します。
.TP
+\-\-startuptime {file}
+起動処理の間、経過時間のメッセージをファイル {fname} に書き出します。
+.TP
\-\-version
バージョン情報を表示して終了します。
.SH オンラインヘルプ
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index 8942466..94a5057 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1,4 +1,4 @@
-*vim9.txt* For Vim version 8.2. Last change: 2022 Jan 07
+*vim9.txt* For Vim version 8.2. Last change: 2022 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -103,6 +103,8 @@
`:exe`: >
:exe @a
- Unless mentioned specifically, the highest |scriptversion| is used.
+- When defining an expression mapping, the expression will be evaluated in the
+ context of the script where it was defined.
Comments starting with # ~
@@ -1357,9 +1359,11 @@
5. Namespace, Import and Export
*vim9script* *vim9-export* *vim9-import*
-A Vim9 script can be written to be imported. This means that everything in
-the script is local, except for items that are exported. Those exported
-items, and only those items, can then be imported in another script.
+A Vim9 script can be written to be imported. This means that some items are
+intentionally exported, made available to other scripts. When the exporting
+script is imported in another script, these exported items can then be used in
+that script. All the other items remain script-local in the exporting script
+and cannot be accessed by the importing script.
This mechanism exists for writing a script that can be sourced (imported) by
other scripts, while making sure these other scripts only have access to what
@@ -1367,8 +1371,8 @@
risc of name collisions. For example when you have two plugins with similar
functionality.
-You can cheat by using the global namespace explicitly. We will assume here
-that you don't do that.
+You can cheat by using the global namespace explicitly. That should be done
+only for things that really are global.
Namespace ~
@@ -1500,7 +1504,7 @@
result in undefined items.
-Import in an autoload script ~
+Importing an autoload script ~
*vim9-autoload*
For optimal startup speed, loading scripts should be postponed until they are
actually needed. Using the autoload mechanism is recommended:
@@ -1534,16 +1538,30 @@
You can split up the functionality and import other scripts from the
autoload script as you like. This way you can share code between plugins.
+For defining a mapping that uses the imported autoload script the special key
+|<ScriptCmd>| is useful. It allows for a command in a mapping to use the
+script context of where the mapping was defined.
+
When compiling a `:def` function and a function in an autoload script is
encountered, the script is not loaded until the `:def` function is called.
This also means you get any errors only at runtime, since the argument and
return types are not known yet.
+For testing the |test_override()| function can be used to have the
+`import autoload` load the script right away, so that the items and types can
+be checked without waiting for them to be actually used: >
+ test_override('autoload', 1)
+Reset it later with: >
+ test_override('autoload', 0)
+Or: >
+ test_override('ALL', 0)
+
Import in legacy Vim script ~
If an `import` statement is used in legacy Vim script, the script-local "s:"
-namespace will be used for the imported item, even when "s:" is not specified.
+namespace will be used for the imported items, even when "s:" is not
+specified.
==============================================================================
diff --git a/runtime/doc/vimdiff-ja.UTF-8.1 b/runtime/doc/vimdiff-ja.UTF-8.1
index 03fb900..b9324ee 100644
--- a/runtime/doc/vimdiff-ja.UTF-8.1
+++ b/runtime/doc/vimdiff-ja.UTF-8.1
@@ -1,15 +1,15 @@
.TH VIMDIFF 1 "2001 March 30"
.SH 名前
-vimdiff \- 二つか三つか四つのファイルを Vim で開いて、その差分を表示する
+vimdiff \- 2 個から 8 個のファイルを Vim で開いて、その差分を表示する
.SH 書式
.br
.B vimdiff
-[options] file1 file2 [file3 [file4]]
+[options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]]
.PP
.B gvimdiff
.SH 説明
.B Vimdiff
-は、二つ (か三つか四つ) のファイルを
+は、2 個から 8 個のファイルを
.B Vim
で開きます。
ファイルは個別のウィンドウで開かれ、差分が強調表示されます。
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/xxd-ja.UTF-8.1
index b0640cf..a03671c 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/xxd-ja.UTF-8.1
@@ -74,6 +74,7 @@
一行
.RI < cols >
オクテットで出力する。標準設定は 16 (\-i: 12, \-ps: 30, \-b: 6)。最大 256。
+\-ps には最大値がありません。 \-ps 付きの場合、0 を指定すると単一の長い行で出力されます。
.TP
.IR \-C " | " \-capitalize
\-i を使用した際に、C インクルードファイル形式の変数名を大文字にする。