diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-01-16 14:46:06 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-01-16 14:46:06 +0000 |
commit | fd31be29b8220ee1cb0b3460c82f2634ae3cc370 (patch) | |
tree | 93ad5a4e32bbbbd52b42226ffdf05c4b03f10b6e | |
parent | c81e9bf4f07d350b860b934aa6bf0c2a7c91d07e (diff) |
Update runtime files
-rw-r--r-- | runtime/autoload/dist/ft.vim | 2 | ||||
-rw-r--r-- | runtime/doc/autocmd.txt | 36 | ||||
-rw-r--r-- | runtime/doc/builtin.txt | 2 | ||||
-rw-r--r-- | runtime/doc/editing.txt | 5 | ||||
-rw-r--r-- | runtime/doc/map.txt | 6 | ||||
-rw-r--r-- | runtime/doc/repeat.txt | 2 | ||||
-rw-r--r-- | runtime/doc/tags | 6 | ||||
-rw-r--r-- | runtime/doc/testing.txt | 2 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 25 | ||||
-rw-r--r-- | runtime/doc/various.txt | 18 | ||||
-rw-r--r-- | runtime/doc/vim-ja.UTF-8.1 | 12 | ||||
-rw-r--r-- | runtime/doc/vim9.txt | 34 | ||||
-rw-r--r-- | runtime/doc/vimdiff-ja.UTF-8.1 | 6 | ||||
-rw-r--r-- | runtime/doc/xxd-ja.UTF-8.1 | 1 | ||||
-rw-r--r-- | runtime/filetype.vim | 2 | ||||
-rw-r--r-- | runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 16 | ||||
-rw-r--r-- | runtime/syntax/i3config.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/vim.vim | 16 | ||||
-rw-r--r-- | runtime/tutor/tutor.ja.euc | 230 | ||||
-rw-r--r-- | runtime/tutor/tutor.ja.sjis | 230 | ||||
-rw-r--r-- | runtime/tutor/tutor.ja.utf-8 | 230 | ||||
-rw-r--r-- | src/po/it.po | 6208 | ||||
-rw-r--r-- | src/po/ja.euc-jp.po | 8872 | ||||
-rw-r--r-- | src/po/ja.po | 8872 | ||||
-rw-r--r-- | src/po/ja.sjis.po | 8874 |
25 files changed, 20630 insertions, 13081 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 342731b272..0d6841a35b 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -1,7 +1,7 @@ " Vim functions for file type detection " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2021 Dec 17 +" Last Change: 2022 Jan 11 " These functions are moved here from runtime/filetype.vim to make startup " faster. diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index c1aee0ef8b..96a0e4b00b 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 @@ effects. Be careful not to destroy your text. 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 @@ prompt. When one command outputs two messages this can happen anyway. ============================================================================== 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 @@ with ":augroup"); otherwise, Vim uses the group defined with [group]. ============================================================================== 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 @@ WinNew When a new window was created. Not done for 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 9029685f5d..3850b38605 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 ebb78b099a..4f217fddd0 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 @@ becomes the current directory for that window. Windows where the |:lcd| 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 1072d56ce9..2727a4ccde 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 @@ input. Example: > 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 @@ useful for |Vim9| script. It also works to access an import, which is useful 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 407c23c239..8ea19584b5 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 78e88f3032..8914fc27cd 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3649,6 +3649,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* <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 @@ vim.w if_lua.txt /*vim.w* 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_gettype() builtin.txt /*win_gettype()* 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 @@ zz scroll.txt /*zz* {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 @@ zz scroll.txt /*zz* {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 3ff1450653..0459aa3042 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 b18effdccd..851c167954 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 @@ browser use: https://github.com/vim/vim/issues/1234 *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 @@ Terminal emulator window: 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 @@ With 'foldmethod' "indent" and appending an empty line, what follows isn't 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 a3feeb0213..fb0a3575da 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 @@ N *+X11* Unix only: can restore window title |X11| :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 363922bcaf..8751391677 100644 --- a/runtime/doc/vim-ja.UTF-8.1 +++ b/runtime/doc/vim-ja.UTF-8.1 @@ -166,7 +166,7 @@ Note: "+" と "\-c" は合わせて 10 個まで指定できます。 .TP \-d 差分モードで起動します。 -二つか三つの四つのファイルを引数に指定してください。 +2 個から 8 個のファイルを引数に指定してください。 指定されたファイルが開かれ、それらのファイルの差分が表示されます。 vimdiff(1) と同様の動作です。 .TP @@ -217,8 +217,7 @@ GUI がサポートされている場合は、GUI で起動します。 サポートされていない場合はエラーメッセージを表示して終了します。 .TP \-i {viminfo} -viminfo ファイルを使う設定になっている場合は、初期設定の "~/.viminfo" -の代わりに、指定されたファイルを設定します。 +初期設定の "~/.viminfo" の代わりに、viminfo ファイルを読み書きする際に使うファイル名を指定します。 "NONE" を指定すると、.viminfo ファイルを使わないように設定できます。 .TP \-L @@ -356,6 +355,10 @@ X サーバーと通信しません。端末での起動時間を短くできま これ以降の引数はすべてファイル名として扱われます。 ファイル名が '\-' で始まっているファイルを開くときに使ってください。 .TP +\-\-clean +一切の個人設定 (vimrc、プラグイン、その他) を使用しません。 +ある問題がクリーンな Vim セットアップで再現するかを確認するのに有用です。 +.TP \-\-echo\-wid GTK GUI のみ: Window ID を標準出力に出力します。 .TP @@ -398,6 +401,9 @@ Vim サーバーの一覧を表示します。 \-\-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 8942466e39..94a505773f 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 @@ script and `:def` functions; details are below: `: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 @@ Same for |extend()|, use |extendnew()| instead, and for |flatten()|, use 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 @@ you want them to. This also avoids using the global namespace, which has a 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 @@ or indirectly) imports the current script, then items defined after the 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 @@ actually needed. Using the autoload mechanism is recommended: 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 03fb900186..b9324ee401 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 b0640cf820..a03671cb1d 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 インクルードファイル形式の変数名を大文字にする。 diff --git a/runtime/filetype.vim b/runtime/filetype.vim index b1e6c6d4d2..3b61295859 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2022 Jan 05 +" Last Change: 2022 Jan 13 " Listen very carefully, I will say this only once if exists("did_load_filetypes") diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index d288af1797..fde59df3d7 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -2,7 +2,7 @@ " " Author: Bram Moolenaar " Copyright: Vim license applies, see ":help license" -" Last Change: 2021 Dec 16 +" Last Change: 2022 Jan 13 " " WORK IN PROGRESS - Only the basics work " Note: On MS-Windows you need a recent version of gdb. The one included with @@ -1252,8 +1252,17 @@ func s:HandleCursor(msg) if a:msg =~ '^\(\*stopped\|=thread-selected\)' && filereadable(fname) let lnum = substitute(a:msg, '.*line="\([^"]*\)".*', '\1', '') if lnum =~ '^[0-9]*$' - call s:GotoSourcewinOrCreateIt() + call s:GotoSourcewinOrCreateIt() if expand('%:p') != fnamemodify(fname, ':p') + augroup Termdebug + " Always open a file read-only instead of showing the ATTENTION + " prompt, since we are unlikely to want to edit the file. + " The file may be changed but not saved, warn for that. + au SwapExists * echohl WarningMsg + \ | echo 'Warning: file is being edited elsewhere' + \ | echohl None + \ | let v:swapchoice = '0' + augroup END if &modified " TODO: find existing window exe 'split ' . fnameescape(fname) @@ -1262,6 +1271,9 @@ func s:HandleCursor(msg) else exe 'edit ' . fnameescape(fname) endif + augroup Termdebug + au! SwapExists + augroup END endif exe lnum normal! zv diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim index f9e15d57e5..a2f50e50b8 100644 --- a/runtime/syntax/i3config.vim +++ b/runtime/syntax/i3config.vim @@ -3,7 +3,7 @@ " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com> " Maintainer: Quentin Hibon (github user hiqua) " Version: 0.4 -" Last Change: 2022 Jan 04 +" Last Change: 2022 Jan 15 " References: " http://i3wm.org/docs/userguide.html#configuring @@ -175,7 +175,7 @@ syn keyword i3ConfigDrawingMarksKeyword show_marks contained syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDrawingMarksKeyword " Group mode/bar -syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained +syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_min_width workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained syn region i3ConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend " Line continuation diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 1810623b45..abdce6aeab 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 8.2 script " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> -" Last Change: December 29, 2021 -" Version: 8.2-23 +" Last Change: January 11, 2022 +" Version: 8.2-24 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " Automatically generated keyword lists: {{{1 @@ -78,12 +78,12 @@ syn match vimHLGroup contained "Conceal" syn case match " Function Names {{{2 -syn keyword vimFuncName contained abs argc assert_equal assert_match atan browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filter floor foldlevel function getchangelist getcmdline getcursorcharpos getftime getmarklist getreg gettabwinvar getwinposx globpath histadd hlget indent inputrestore invert items job_status json_decode libcallnr list2str log mapcheck matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_ignore_error test_null_job test_override test_srand_seed timer_start tr undofile visualmode win_execute winheight winnr win_splitmove -syn keyword vimFuncName contained acos argidx assert_equalfile assert_nobeep atan2 browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath extend finddir fmod foldtext garbagecollect getchar getcmdpos getcwd getftype getmatches getreginfo gettagstack getwinposy has histdel hlID index inputsave isdirectory job_getchannel job_stop json_encode line listener_add log10 mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_blob test_null_list test_refcount test_unknown timer_stop trim undotree wildmenumode win_findbuf win_id2tabwin winrestcmd winwidth -syn keyword vimFuncName contained add arglistid assert_exception assert_notequal balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extendnew findfile fnameescape foldtextresult get getcharmod getcmdtype getenv getimstatus getmousepos getregtype gettext getwinvar has_key histget hlset input inputsecret isinf job_info join keys line2byte listener_flush luaeval mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc uniq winbufnr win_getid win_id2win winrestview wordcount -syn keyword vimFuncName contained and argv assert_fails assert_notmatch balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled feedkeys flatten fnamemodify foreground getbufinfo getcharpos getcmdwintype getfontname getjumplist getpid gettabinfo getwininfo glob haslocaldir histnr hostname inputdialog insert islocked job_setoptions js_decode len lispindent listener_remove map match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_drop_files test_null_dict test_null_string test_setmouse timer_info tolower type values wincol win_gettype winlayout winsaveview writefile -syn keyword vimFuncName contained append asin assert_false assert_report balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp filereadable flattennew foldclosed fullcommand getbufline getcharsearch getcompletion getfperm getline getpos gettabvar getwinpos glob2regpat hasmapto hlexists iconv inputlist interrupt isnan job_start js_encode libcall list2blob localtime maparg matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_gui_mouse_event test_null_function test_option_not_set test_settime timer_pause toupper typename virtcol windowsversion win_gotoid winline win_screenpos xor -syn keyword vimFuncName contained appendbufline assert_beeps assert_inrange assert_true blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filewritable float2nr foldclosedend funcref getbufvar getcharstr getcurpos getfsize getloclist getqflist +syn keyword vimFuncName contained abs argc assert_equal assert_match atan browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filter floor foldlevel function getchangelist getcmdline getcursorcharpos getftime getmarklist getreg gettagstack getwinvar has_key histget hlset input inputsecret isinf job_info join keys line2byte listener_flush luaeval mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc uniq winbufnr win_getid win_id2win winnr win_splitmove +syn keyword vimFuncName contained acos argidx assert_equalfile assert_nobeep atan2 browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath extend finddir fmod foldtext garbagecollect getchar getcmdpos getcwd getftype getmatches getreginfo gettext glob haslocaldir histnr hostname inputdialog insert islocked job_setoptions js_decode len lispindent listener_remove map match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_drop_files test_null_dict test_null_string test_setmouse timer_info tolower type values wincol win_gettype winlayout winrestcmd winwidth +syn keyword vimFuncName contained add arglistid assert_exception assert_notequal balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extendnew findfile fnameescape foldtextresult get getcharmod getcmdtype getenv getimstatus getmousepos getregtype getwininfo glob2regpat hasmapto hlexists iconv inputlist interrupt isnan job_start js_encode libcall list2blob localtime maparg matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_gui_mouse_event test_null_function test_option_not_set test_settime timer_pause toupper typename virtcol windowsversion win_gotoid winline winrestview wordcount +syn keyword vimFuncName contained and argv assert_fails assert_notmatch balloon_show bu |