• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision03e3b0034e31630e9465b2829089dadf79543cb0 (tree)
Zeit2022-07-06 21:30:05
AutorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

Update runtime files

Commit: https://github.com/vim/vim/commit/5ed11535e0695163cec71033b98bb97356cf0113
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 6 13:18:11 2022 +0100

Update runtime files

Ändern Zusammenfassung

Diff

diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/builtin.txt
--- a/runtime/doc/builtin.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/builtin.txt Wed Jul 06 14:30:05 2022 +0200
@@ -2872,6 +2872,10 @@
28722872 /home/user/vim/vim/src
28732873 < If {mods} is empty or an unsupported modifier is used then
28742874 {fname} is returned.
2875+ When {fname} is empty then with {mods} ":h" returns ".", so
2876+ that `:cd` can be used with it. This is different from
2877+ expand('%:h') without a buffer name, which returns an empty
2878+ string.
28752879 Note: Environment variables don't work in {fname}, use
28762880 |expand()| first then.
28772881
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/intro.txt
--- a/runtime/doc/intro.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/intro.txt Wed Jul 06 14:30:05 2022 +0200
@@ -697,7 +697,8 @@
697697 line-input editing commands (<Del> or <BS> to erase,
698698 CTRL-U to kill the whole line).
699699 Vim will enter this mode by default if it's invoked as
700- "ex" on the command-line.
700+ "ex" on the command-line or the |-e| command line
701+ argument was used.
701702 Use the ":vi" command |:visual| to exit "Ex" mode.
702703 Note: In older versions of Vim "Q" formatted text,
703704 that is now done with |gq|. But if you use the
@@ -708,7 +709,7 @@
708709 gQ Switch to "Ex" mode like with "Q", but really behave
709710 like typing ":" commands after another. All command
710711 line editing, completion etc. is available.
711- Use the ":vi" command |:visual| to exit "Ex" mode.
712+ Use the `:vi` command (`:visual`) to exit "Ex" mode.
712713
713714 ==============================================================================
714715 7. The window contents *window-contents*
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/map.txt
--- a/runtime/doc/map.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/map.txt Wed Jul 06 14:30:05 2022 +0200
@@ -374,15 +374,17 @@
374374 <ScriptCmd> is like <Cmd> but sets the context to the script the mapping was
375375 defined in, for the duration of the command execution. This is especially
376376 useful for |Vim9| script. It also works to access an import, which is useful
377-in a plugin using an autoload script: >
377+in a plugin using a, possibly autoloaded, script: >
378378 vim9script
379379 import autoload 'implementation.vim' as impl
380380 nnoremap <F4> <ScriptCmd>impl.DoTheWork()<CR>
381-
381+<
382382 No matter where <F4> is typed, the "impl" import will be found in the script
383-context of where the mapping was defined. And since it's an autoload import,
384-the "implementation.vim" script will only be loaded once <F4> is typed, not
385-when the mapping is defined.
383+context of where the mapping was defined. When it's an autoload import, as in
384+the example, the "implementation.vim" script will only be loaded once <F4> is
385+typed, not when the mapping is defined.
386+
387+Without <ScriptCmd> using "s:impl" would result in "E121: Undefined variable".
386388
387389 Note:
388390 - Because <Cmd> and <ScriptCmd> avoid mode-changes it does not trigger
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/options.txt
--- a/runtime/doc/options.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/options.txt Wed Jul 06 14:30:05 2022 +0200
@@ -1677,7 +1677,7 @@
16771677 feature is included}
16781678 This option is a list of comma-separated names.
16791679 Note: if one of the items is "exclude:", then you can't add an item
1680- after that. Therefore do append an item with += but use ^= to
1680+ after that. Therefore do not append an item with += but use ^= to
16811681 prepend, e.g.: >
16821682 set clipboard^=unnamed
16831683 < These names are recognized:
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/tags
--- a/runtime/doc/tags Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/tags Wed Jul 06 14:30:05 2022 +0200
@@ -7881,6 +7881,7 @@
78817881 if_tcl.txt if_tcl.txt /*if_tcl.txt*
78827882 ignore-errors eval.txt /*ignore-errors*
78837883 ignore-timestamp editing.txt /*ignore-timestamp*
7884+import-legacy vim9.txt /*import-legacy*
78847885 improved-autocmds-5.4 version5.txt /*improved-autocmds-5.4*
78857886 improved-quickfix version5.txt /*improved-quickfix*
78867887 improved-sessions version5.txt /*improved-sessions*
@@ -8070,6 +8071,7 @@
80708071 lcs-tab options.txt /*lcs-tab*
80718072 lcs-trail options.txt /*lcs-trail*
80728073 left-right-motions motion.txt /*left-right-motions*
8074+legacy-import vim9.txt /*legacy-import*
80738075 len() builtin.txt /*len()*
80748076 less various.txt /*less*
80758077 letter print.txt /*letter*
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/term.txt
--- a/runtime/doc/term.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/term.txt Wed Jul 06 14:30:05 2022 +0200
@@ -633,10 +633,13 @@
633633 *termcap-cursor-shape* *termcap-cursor-color*
634634 When Vim enters Insert mode the 't_SI' escape sequence is sent. When Vim
635635 enters Replace mode the 't_SR' escape sequence is sent if it is set, otherwise
636-'t_SI' is sent. When leaving Insert mode or Replace mode 't_EI' is used. This
637-can be used to change the shape or color of the cursor in Insert or Replace
638-mode. These are not standard termcap/terminfo entries, you need to set them
639-yourself.
636+'t_SI' is sent. When leaving Insert mode or Replace mode 't_EI' is used.
637+Note: When 't_EI' is not set then 't_SI' and 't_SR' will not be sent. And
638+when 't_SI' or 't_SR' is not set then 't_EI' is sent only once.
639+
640+This can be used to change the shape or color of the cursor in Insert or
641+Replace mode. These are not standard termcap/terminfo entries, you need to set
642+them yourself.
640643 Example for an xterm, this changes the color of the cursor: >
641644 if &term =~ "xterm"
642645 let &t_SI = "\<Esc>]12;purple\x7"
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/todo.txt Wed Jul 06 14:30:05 2022 +0200
@@ -68,6 +68,12 @@
6868 - Implement as part of an expression: ++expr, --expr, expr++, expr--.
6969
7070 Update list of features to vote on:
71+- Remove Athena item (won't happen)
72+- Remove "add open mode" (won't happen)
73+- Remove "editing of a hidden buffer" (done)
74+- Change "add IDE features" to "improve terminal debugger"
75+- Change "diff/merge capability for CVS" to "CVS and git"
76+- Remove "pre-compile them" from "improve the performance of Vim scripts"
7177 - multiple cursors
7278 - built-in LSP support
7379 - virtual text, using text properties
@@ -117,8 +123,6 @@
117123 if the priority is above a certain value? (#7392)
118124 Combining text property with 'cursorline' does not always work (Billie
119125 Cleek, #5533)
120-- "C" works OK. "dd" fails to delete text property in a buffer with a single
121- line.
122126 - Add text property that shifts text to make room for annotation (e.g.
123127 variable type). Like the opposite of conceal. Requires fixing the cursor
124128 positioning and mouse clicks as with conceal mode.
@@ -200,9 +204,6 @@
200204 Patches considered for including:
201205 - Add "-n" option to xxd. #10599 needs a test
202206 - allow for nesting of timeout, sketch in #10595
203-- Patch to implement the vimtutor with a plugin: #6414
204- Was originally written by Felipe Morales.
205-- Patch to make fillchars global-local. (#5206)
206207
207208 Autoconf: must use autoconf 2.69, later version generates lots of warnings
208209 - try using autoconf 2.71 and fix all "obsolete" warnings
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/doc/vim9.txt
--- a/runtime/doc/vim9.txt Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/doc/vim9.txt Wed Jul 06 14:30:05 2022 +0200
@@ -145,6 +145,17 @@
145145 and produces an error where this might be confusing. #{{ or #{{{ are OK,
146146 these can be used to start a fold.
147147
148+When starting to read a script file Vim doesn't know it is |Vim9| script until
149+the `vim9script` command is found. Until that point you would need to use
150+legacy comments: >
151+ " legacy comment
152+ vim9script
153+ # Vim9 comment
154+
155+That looks ugly, better put `vim9script` in the very first line: >
156+ vim9script
157+ # Vim9 comment
158+
148159 In legacy Vim script # is also used for the alternate file name. In Vim9
149160 script you need to use %% instead. Instead of ## use %%% (stands for all
150161 arguments).
@@ -1687,21 +1698,34 @@
16871698 Import ~
16881699 *:import* *:imp* *E1094* *E1047* *E1262*
16891700 *E1048* *E1049* *E1053* *E1071* *E1236*
1690-The exported items can be imported in another Vim9 script: >
1701+The exported items can be imported in another script. The import syntax has
1702+two forms. The simple form: >
1703+ import {filename}
1704+<
1705+Where {filename} is an expression that must evaluate to a string. In this
1706+form the filename should end in ".vim" and the portion before ".vim" will
1707+become the script local name of the namespace. For example: >
16911708 import "myscript.vim"
1692-
1693-This makes each item available as "myscript.item".
1709+<
1710+This makes each exported item in "myscript.vim" available as "myscript.item".
16941711 *:import-as* *E1257* *E1261*
1695-In case the name is long or ambiguous, another name can be specified: >
1696- import "thatscript.vim" as that
1712+In case the name is long or ambiguous, this form can be used to specify
1713+another name: >
1714+ import {longfilename} as {name}
1715+<
1716+In this form {name} becomes a specific script local name for the imported
1717+namespace. Therefore {name} must consist of letters, digits and '_', like
1718+|internal-variables|. The {longfilename} expression must evaluate to any
1719+filename. For example: >
1720+ import "thatscript.vim.v2" as that
16971721 < *E1060* *E1258* *E1259* *E1260*
1698-Then you can use "that.EXPORTED_CONST", "that.someValue", etc. You are free
1699-to choose the name "that". Use something that will be recognized as referring
1700-to the imported script. Avoid command names, command modifiers and builtin
1701-function names, because the name will shadow them.
1702-If the name starts with a capital letter it can also shadow global user
1703-commands and functions. Also, you cannot use the name for something else in
1704-the script, such as a function or variable name.
1722+Then you can use "that.item", etc. You are free to choose the name "that".
1723+Use something that will be recognized as referring to the imported script.
1724+Avoid command names, command modifiers and builtin function names, because the
1725+name will shadow them. Better not start the name starts with a capital
1726+letter, since it can then also shadow global user commands and functions.
1727+Also, you cannot use the name for something else in the script, such as a
1728+function or variable name.
17051729
17061730 In case the dot in the name is undesired, a local reference can be made for a
17071731 function: >
@@ -1714,15 +1738,6 @@
17141738 when changing the variable the copy will change, not the original variable.
17151739 You will need to use the full name, with the dot.
17161740
1717-The full syntax of the command is:
1718- import {filename} [as {name}]
1719-Where {filename} is an expression that must evaluate to a string. Without the
1720-"as {name}" part it must end in ".vim". {name} must consist of letters,
1721-digits and '_', like |internal-variables|.
1722-
1723-`:import` can also be used in legacy Vim script. The imported items still
1724-become script-local, even when the "s:" prefix is not given.
1725-
17261741 `:import` can not be used in a function. Imported items are intended to exist
17271742 at the script level and only imported once.
17281743
@@ -1752,14 +1767,38 @@
17521767 echo that
17531768 .name # Error!
17541769
1755-To refer to a function in an imported script in a mapping, |<SID>| can be
1756-used: >
1770+When you've imported a function from one script into a vim9 script you can
1771+refer to the imported function in a mapping by prefixing it with |<SID>|: >
17571772 noremap <silent> ,a :call <SID>name.Function()<CR>
17581773
17591774 When the mapping is defined "<SID>name." will be replaced with <SNR> and the
17601775 script ID of the imported script.
17611776 An even simpler solution is using |<ScriptCmd>|: >
17621777 noremap ,a <ScriptCmd>name.Function()<CR>
1778+
1779+Note that this does not work for variables, only for functions.
1780+
1781+ *import-legacy* *legacy-import*
1782+`:import` can also be used in legacy Vim script. The imported namespace still
1783+becomes script-local, even when the "s:" prefix is not given. For example: >
1784+ import "myfile.vim"
1785+ call s:myfile.MyFunc()
1786+
1787+And using the "as name" form: >
1788+ import "otherfile.vim9script" as that
1789+ call s:that.OtherFunc()
1790+
1791+However, the namespace cannot be resolved on it's own: >
1792+ import "that.vim"
1793+ echo s:that
1794+ " ERROR: E1060: Expected dot after name: s:that
1795+<
1796+This also affects the use of |<SID>| in the legacy mapping context. Since
1797+|<SID>| is only a valid prefix for a function and NOT for a namespace, you
1798+cannot use it
1799+to scope a function in a script local namespace. Instead of prefixing the
1800+function with |<SID>| you should use|<ScriptCmd>|. For example: >
1801+ noremap ,a <ScriptCmd>:call s:that.OtherFunc()<CR>
17631802 <
17641803 *:import-cycle*
17651804 The `import` commands are executed when encountered. If script A imports
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/filetype.vim
--- a/runtime/filetype.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/filetype.vim Wed Jul 06 14:30:05 2022 +0200
@@ -1,7 +1,7 @@
11 " Vim support file to detect file types
22 "
33 " Maintainer: Bram Moolenaar <Bram@vim.org>
4-" Last Change: 2022 Jun 03
4+" Last Change: 2022 Jul 5
55
66 " Listen very carefully, I will say this only once
77 if exists("did_load_filetypes")
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/ftplugin/vim.vim
--- a/runtime/ftplugin/vim.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/ftplugin/vim.vim Wed Jul 06 14:30:05 2022 +0200
@@ -16,7 +16,7 @@
1616
1717 if !exists('*VimFtpluginUndo')
1818 func VimFtpluginUndo()
19- setl fo< isk< com< tw< commentstring<
19+ setl fo< isk< com< tw< commentstring< include< define<
2020 if exists('b:did_add_maps')
2121 silent! nunmap <buffer> [[
2222 silent! vunmap <buffer> [[
@@ -59,6 +59,11 @@
5959 setlocal commentstring=\"%s
6060 endif
6161
62+" set 'include' to recognize import commands
63+setlocal include=\\v^\\s*import\\s*(autoload)?
64+
65+" set 'define' to recognize export commands
66+setlocal define=\\v^\\s*export\\s*(def\|const\|var\|final)
6267
6368 " Format comments to be up to 78 characters long
6469 if &tw == 0
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/lang/menu_zh_cn.utf-8.vim
--- a/runtime/lang/menu_zh_cn.utf-8.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/lang/menu_zh_cn.utf-8.vim Wed Jul 06 14:30:05 2022 +0200
@@ -1,10 +1,15 @@
11 " Menu Translations: Simplified Chinese
2-" Maintainer: Shun Bai <baishunde@gmail.com>
3-" Previous Maintainer: Yuheng Xie <elephant@linux.net.cn>
4-" Last Change: 2022 Feb 19
2+" Maintainer: Ada (Haowen) Yu <me@yuhaowen.com>
3+" Previous Maintainer: Shun Bai <baishunde@gmail.com>, Yuheng Xie <elephant@linux.net.cn>
4+" Last Change: 2022 July 6
55 " Original translations
6+"
7+" Generated with the scripts from:
8+"
9+" https://github.com/adaext/vim-menutrans-helper
610
711 " Quit when menu translations have already been done.
12+
813 if exists("did_menu_trans")
914 finish
1015 endif
@@ -15,18 +20,18 @@
1520 scriptencoding utf-8
1621
1722 " Help menu
18-menutrans &Help 帮助(&H)
23+menutrans &Help 帮助(&H)
1924 " Help menuitems and dialog {{{1
20-menutrans &Overview<Tab><F1> 概述(&O)<Tab><F1>
21-menutrans &User\ Manual 用户手册(&U)
22-menutrans &How-to\ Links 如何使用(&H)
23-menutrans &Find\.\.\. 查找(&F)\.\.\.
24-menutrans &Credits 致谢(&C)
25-menutrans Co&pying 版权(&P)
26-menutrans &Sponsor/Register 赞助/注册(&S)
27-menutrans O&rphans 拯救孤儿(&R)
28-menutrans &Version 版本(&V)
29-menutrans &About 关于(&A)
25+menutrans &Overview<Tab><F1> 概述(&O)<Tab><F1>
26+menutrans &User\ Manual 用户手册(&U)
27+menutrans &How-to\ Links 如何使用(&H)
28+menutrans &Find\.\.\. 查找(&F)\.\.\.
29+menutrans &Credits 致谢(&C)
30+menutrans Co&pying 版权(&P)
31+menutrans &Sponsor/Register 赞助/注册(&S)
32+menutrans O&rphans 拯救孤儿(&R)
33+menutrans &Version 版本(&V)
34+menutrans &About 关于(&A)
3035
3136 " fun! s:Helpfind()
3237 if !exists("g:menutrans_help_dialog")
@@ -35,67 +40,68 @@
3540 " }}}
3641
3742 " File menu
38-menutrans &File 文件(&F)
43+menutrans &File 文件(&F)
3944 " File menuitems {{{1
40-menutrans &Open\.\.\.<Tab>:e 打开(&O)\.\.\.<Tab>:e
41-menutrans Sp&lit-Open\.\.\.<Tab>:sp 在拆分窗口打开(&L)\.\.\.<Tab>:sp
42-menutrans Open\ Tab\.\.\.<Tab>:tabnew 在标签页打开\.\.\.<Tab>:tabnew
43-menutrans &New<Tab>:enew 新建(&N)<Tab>:enew
44-menutrans &Close<Tab>:close 关闭(&C)<Tab>:close
45-menutrans &Save<Tab>:w 保存(&S)<Tab>:w
46-menutrans Save\ &As\.\.\.<Tab>:sav 另存为(&A)\.\.\.<Tab>:sav
47-menutrans Split\ &Diff\ With\.\.\. 拆分窗口以对比差异(Diff)(&D)\.\.\.
48-menutrans Split\ Patched\ &By\.\.\. 拆分窗口以进行修补(Patch)(&B)\.\.\.
49-menutrans &Print 打印(&P)
50-menutrans Sa&ve-Exit<Tab>:wqa 保存并退出(&V)<Tab>:wqa
51-menutrans E&xit<Tab>:qa 退出(&X)<Tab>:qa
45+menutrans &Open\.\.\.<Tab>:e 打开(&O)\.\.\.<Tab>:e
46+menutrans Sp&lit-Open\.\.\.<Tab>:sp 在拆分窗口打开(&L)\.\.\.<Tab>:sp
47+menutrans Open\ Tab\.\.\.<Tab>:tabnew 在标签页打开\.\.\.<Tab>:tabnew
48+menutrans &New<Tab>:enew 新建(&N)<Tab>:enew
49+menutrans &Close<Tab>:close 关闭(&C)<Tab>:close
50+menutrans &Save<Tab>:w 保存(&S)<Tab>:w
51+menutrans Save\ &As\.\.\.<Tab>:sav 另存为(&A)\.\.\.<Tab>:sav
52+menutrans Split\ &Diff\ With\.\.\. 拆分窗口以对比差异(Diff)(&D)\.\.\.
53+menutrans Split\ Patched\ &By\.\.\. 拆分窗口以进行修补(Patch)(&B)\.\.\.
54+menutrans &Print 打印(&P)
55+menutrans Sa&ve-Exit<Tab>:wqa 保存并退出(&V)<Tab>:wqa
56+menutrans E&xit<Tab>:qa 退出(&X)<Tab>:qa
5257 " }}}
5358
5459 " Edit menu
55-menutrans &Edit 编辑(&E)
60+menutrans &Edit 编辑(&E)
5661 " Edit menuitems {{{1
57-menutrans &Undo<Tab>u 撤销(&U)<Tab>u
58-menutrans &Redo<Tab>^R 恢复(&R)<Tab>^R
59-menutrans Rep&eat<Tab>\. 重复(&E)<Tab>\.
60-menutrans Cu&t<Tab>"+x 剪切(&T)<Tab>"+x
61-menutrans &Copy<Tab>"+y 复制(&C)<Tab>"+y
62-menutrans &Paste<Tab>"+gP 粘贴(&P)<Tab>"+gP
63-menutrans Put\ &Before<Tab>[p 粘贴到光标前(&B)<Tab>[p
64-menutrans Put\ &After<Tab>]p 粘贴到光标后(&A)<Tab>]p
65-menutrans &Delete<Tab>x 删除(&D)<Tab>x
66-menutrans &Select\ All<Tab>ggVG 全选(&S)<Tab>ggVG
67-menutrans &Find\.\.\. 查找(&F)\.\.\.
68-menutrans Find\ and\ Rep&lace\.\.\. 查找和替换(&L)\.\.\.
69-menutrans &Find<Tab>/ 查找(&F)<Tab>/
70-menutrans Find\ and\ Rep&lace<Tab>:%s 查找和替换(&L)<Tab>:%s
71-menutrans Settings\ &Window 设置窗口(&W)
72-menutrans Startup\ &Settings 启动设置(&S)
62+menutrans &Undo<Tab>u 撤销(&U)<Tab>u
63+menutrans &Redo<Tab>^R 恢复(&R)<Tab>^R
64+menutrans Rep&eat<Tab>\. 重复(&E)<Tab>\.
65+menutrans Cu&t<Tab>"+x 剪切(&T)<Tab>"+x
66+menutrans &Copy<Tab>"+y 复制(&C)<Tab>"+y
67+menutrans &Paste<Tab>"+gP 粘贴(&P)<Tab>"+gP
68+menutrans Put\ &Before<Tab>[p 粘贴到光标前(&B)<Tab>[p
69+menutrans Put\ &After<Tab>]p 粘贴到光标后(&A)<Tab>]p
70+menutrans &Delete<Tab>x 删除(&D)<Tab>x
71+menutrans &Select\ All<Tab>ggVG 全选(&S)<Tab>ggVG
72+menutrans &Find\.\.\. 查找(&F)\.\.\.
73+menutrans Find\ and\ Rep&lace\.\.\. 查找和替换(&L)\.\.\.
74+menutrans &Find<Tab>/ 查找(&F)<Tab>/
75+menutrans Find\ and\ Rep&lace<Tab>:%s 查找和替换(&L)<Tab>:%s
76+menutrans Find\ and\ Rep&lace<Tab>:s 查找和替换(&L)<Tab>:s
77+menutrans Settings\ &Window 设置窗口(&W)
78+menutrans Startup\ &Settings 启动设置(&S)
7379
7480 " Edit/Global Settings
75-menutrans &Global\ Settings 全局设置(&G)
81+menutrans &Global\ Settings 全局设置(&G)
7682 " Edit.Global Settings menuitems and dialogs {{{2
77-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! 开/关高亮查找内容(&H)<Tab>:set\ hls!
78-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! 开/关忽略大小写(&I)<Tab>:set\ ic!
79-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! 开/关显示括号匹配(&S)<Tab>:set\ sm!
80-menutrans &Context\ Lines 上下文行数(&C)
81-menutrans &Virtual\ Edit 虚拟编辑(&V)
83+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! 开/关高亮查找内容(&H)<Tab>:set\ hls!
84+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! 开/关忽略大小写(&I)<Tab>:set\ ic!
85+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! 开/关显示括号匹配(&S)<Tab>:set\ sm!
86+menutrans &Context\ Lines 上下文行数(&C)
87+menutrans &Virtual\ Edit 虚拟编辑(&V)
8288 " Edit.Global Settings.Virtual Edit menuitems {{{3
83-menutrans Never 从不
84-menutrans Block\ Selection 只在选定矩形块时
85-menutrans Insert\ Mode 只在插入模式时
86-menutrans Block\ and\ Insert 在选定矩形块和插入模式时
87-menutrans Always 始终
89+menutrans Never 从不
90+menutrans Block\ Selection 只在选定矩形块时
91+menutrans Insert\ Mode 只在插入模式时
92+menutrans Block\ and\ Insert 在选定矩形块和插入模式时
93+menutrans Always 始终
8894 " }}}
89-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! 开/关插入模式(&M)<Tab>:set\ im!
90-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! 开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
91-menutrans Search\ &Path\.\.\. 搜索路径(&P)\.\.\.
92-menutrans Ta&g\ Files\.\.\. 标记文件(Tags)(&G)\.\.\.
95+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! 开/关插入模式(&M)<Tab>:set\ im!
96+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! 开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
97+menutrans Search\ &Path\.\.\. 搜索路径(&P)\.\.\.
98+menutrans Ta&g\ Files\.\.\. 标记文件(Tags)(&G)\.\.\.
9399
94100 " GUI options
95-menutrans Toggle\ &Toolbar 开/关工具栏(&T)
96-menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B)
97-menutrans Toggle\ &Left\ Scrollbar 开/关左侧滚动条(&L)
98-menutrans Toggle\ &Right\ Scrollbar 开/关右侧滚动条(&R)
101+menutrans Toggle\ &Toolbar 开/关工具栏(&T)
102+menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B)
103+menutrans Toggle\ &Left\ Scrollbar 开/关左侧滚动条(&L)
104+menutrans Toggle\ &Right\ Scrollbar 开/关右侧滚动条(&R)
99105
100106 " fun! s:SearchP()
101107 if !exists("g:menutrans_path_dialog")
@@ -109,23 +115,23 @@
109115 " }}}
110116
111117 " Edit/File Settings
112-menutrans F&ile\ Settings 文件设置(&I)
118+menutrans F&ile\ Settings 文件设置(&I)
113119 " Edit.File Settings menuitems and dialogs {{{2
114120 " Boolean options
115-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关行号(&N)<Tab>:set\ nu!
116-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
117-menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关列表模式(&L)<Tab>:set\ list!
118-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap! 开/关换行(&W)<Tab>:set\ wrap!
119-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr! 开/关词尾换行(&R)<Tab>:set\ lbr!
120-menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et! 开/关制表符扩展(&E)<Tab>:set\ et!
121-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai! 开/关自动缩进(&A)<Tab>:set\ ai!
122-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! 开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!
121+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关行号(&N)<Tab>:set\ nu!
122+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
123+menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关列表模式(&L)<Tab>:set\ list!
124+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap! 开/关换行(&W)<Tab>:set\ wrap!
125+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr! 开/关词尾换行(&R)<Tab>:set\ lbr!
126+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et! 开/关制表符扩展(&E)<Tab>:set\ et!
127+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai! 开/关自动缩进(&A)<Tab>:set\ ai!
128+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! 开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!
123129
124130 " other options
125-menutrans &Shiftwidth 缩进宽度(&S)
126-menutrans Soft\ &Tabstop 软制表位宽度(Soft\ Tabstop)(&T)
127-menutrans Te&xt\ Width\.\.\. 文本宽度(&X)\.\.\.
128-menutrans &File\ Format\.\.\. 文件格式(&F)\.\.\.
131+menutrans &Shiftwidth 缩进宽度(&S)
132+menutrans Soft\ &Tabstop 软制表位宽度(Soft\ Tabstop)(&T)
133+menutrans Te&xt\ Width\.\.\. 文本宽度(&X)\.\.\.
134+menutrans &File\ Format\.\.\. 文件格式(&F)\.\.\.
129135
130136 " fun! s:TextWidth()
131137 if !exists("g:menutrans_textwidth_dialog")
@@ -140,36 +146,36 @@
140146 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n取消(&C)"
141147 endif
142148 " }}}
143-menutrans Show\ C&olor\ Schemes\ in\ Menu 在菜单中显示配色方案(&O)
144-menutrans C&olor\ Scheme 配色方案(&O)
145-menutrans Show\ &Keymaps\ in\ Menu 在菜单中显示键盘映射(&K)
146-menutrans &Keymap 键盘映射(&K)
147-menutrans Select\ Fo&nt\.\.\. 选择字体(&N)\.\.\.
149+menutrans Show\ C&olor\ Schemes\ in\ Menu 在菜单中显示配色方案(&O)
150+menutrans C&olor\ Scheme 配色方案(&O)
151+menutrans Show\ &Keymaps\ in\ Menu 在菜单中显示键盘映射(&K)
152+menutrans &Keymap 键盘映射(&K)
153+menutrans Select\ Fo&nt\.\.\. 选择字体(&N)\.\.\.
148154 " }}}
149155
150156 " Programming menu
151-menutrans &Tools 工具(&T)
157+menutrans &Tools 工具(&T)
152158 " Tools menuitems {{{1
153-menutrans &Jump\ to\ This\ Tag<Tab>g^] 跳转到这个标记(Tag)(&J)<Tab>g^]
154-menutrans Jump\ &Back<Tab>^T 跳转回(&B)<Tab>^T
155-menutrans Build\ &Tags\ File 生成标记文件(Tags)(&T)
159+menutrans &Jump\ to\ This\ Tag<Tab>g^] 跳转到这个标记(Tag)(&J)<Tab>g^]
160+menutrans Jump\ &Back<Tab>^T 跳转回(&B)<Tab>^T
161+menutrans Build\ &Tags\ File 生成标记文件(Tags)(&T)
156162
157163 " Tools.Spelling Menu
158-menutrans &Spelling 拼写检查(&S)
164+menutrans &Spelling 拼写检查(&S)
159165 " Tools.Spelling menuitems and dialog {{{2
160-menutrans &Spell\ Check\ On 打开拼写检查(&S)
161-menutrans Spell\ Check\ &Off 关闭拼写检查(&O)
162-menutrans To\ &Next\ Error<Tab>]s 上一个错误(&N)<Tab>]s
163-menutrans To\ &Previous\ Error<Tab>[s 下一个错误(&P)<Tab>[s
164-menutrans Suggest\ &Corrections<Tab>z= 更正建议(&C)<Tab>z=
165-menutrans &Repeat\ Correction<Tab>:spellrepall 更正全部同类错误(&R)<Tab>:spellrepall
166-menutrans Set\ Language\ to\ "en" 设置语言为\ "en"
167-menutrans Set\ Language\ to\ "en_au" 设置语言为\ "en_au"
168-menutrans Set\ Language\ to\ "en_ca" 设置语言为\ "en_ca"
169-menutrans Set\ Language\ to\ "en_gb" 设置语言为\ "en_gb"
170-menutrans Set\ Language\ to\ "en_nz" 设置语言为\ "en_nz"
171-menutrans Set\ Language\ to\ "en_us" 设置语言为\ "en_us"
172-menutrans &Find\ More\ Languages 查找更多语言(&F)
166+menutrans &Spell\ Check\ On 打开拼写检查(&S)
167+menutrans Spell\ Check\ &Off 关闭拼写检查(&O)
168+menutrans To\ &Next\ Error<Tab>]s 上一个错误(&N)<Tab>]s
169+menutrans To\ &Previous\ Error<Tab>[s 下一个错误(&P)<Tab>[s
170+menutrans Suggest\ &Corrections<Tab>z= 更正建议(&C)<Tab>z=
171+menutrans &Repeat\ Correction<Tab>:spellrepall 更正全部同类错误(&R)<Tab>:spellrepall
172+menutrans Set\ Language\ to\ "en" 设置语言为\ "en"
173+menutrans Set\ Language\ to\ "en_au" 设置语言为\ "en_au"
174+menutrans Set\ Language\ to\ "en_ca" 设置语言为\ "en_ca"
175+menutrans Set\ Language\ to\ "en_gb" 设置语言为\ "en_gb"
176+menutrans Set\ Language\ to\ "en_nz" 设置语言为\ "en_nz"
177+menutrans Set\ Language\ to\ "en_us" 设置语言为\ "en_us"
178+menutrans &Find\ More\ Languages 查找更多语言(&F)
173179
174180 " func! s:SpellLang()
175181 if !exists("g:menutrans_set_lang_to")
@@ -178,113 +184,113 @@
178184 " }}}
179185
180186 " Tools.Fold Menu
181-menutrans &Folding 折叠(&F)
187+menutrans &Folding 折叠(&F)
182188 " Tools.Fold menuitems {{{2
183189 " open close folds
184-menutrans &Enable/Disable\ Folds<Tab>zi 启用/禁用折叠(&E)<Tab>zi
185-menutrans &View\ Cursor\ Line<Tab>zv 展开光标所在行(&V)<Tab>zv
186-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx 只展开光标所在行(&W)<Tab>zMzx
187-menutrans C&lose\ More\ Folds<Tab>zm 折叠一级(&L)<Tab>zm
188-menutrans &Close\ All\ Folds<Tab>zM 折叠全部(&C)<Tab>zM
189-menutrans O&pen\ More\ Folds<Tab>zr 展开一级(&P)<Tab>zr
190-menutrans &Open\ All\ Folds<Tab>zR 展开全部(&O)<Tab>zR
190+menutrans &Enable/Disable\ Folds<Tab>zi 启用/禁用折叠(&E)<Tab>zi
191+menutrans &View\ Cursor\ Line<Tab>zv 展开光标所在行(&V)<Tab>zv
192+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx 只展开光标所在行(&W)<Tab>zMzx
193+menutrans C&lose\ More\ Folds<Tab>zm 折叠一级(&L)<Tab>zm
194+menutrans &Close\ All\ Folds<Tab>zM 折叠全部(&C)<Tab>zM
195+menutrans O&pen\ More\ Folds<Tab>zr 展开一级(&P)<Tab>zr
196+menutrans &Open\ All\ Folds<Tab>zR 展开全部(&O)<Tab>zR
191197 " fold method
192-menutrans Fold\ Met&hod 折叠方式(&H)
198+menutrans Fold\ Met&hod 折叠方式(&H)
193199 " Tools.Fold.Fold Method menuitems {{{3
194-menutrans M&anual 手动(&A)
195-menutrans I&ndent 缩进(&N)
196-menutrans E&xpression 表达式(&X)
197-menutrans S&yntax 语法(&Y)
198-menutrans &Diff 差异(Diff)(&D)
199-menutrans Ma&rker 记号(Marker)(&R)
200+menutrans M&anual 手动(&A)
201+menutrans I&ndent 缩进(&N)
202+menutrans E&xpression 表达式(&X)
203+menutrans S&yntax 语法(&Y)
204+menutrans &Diff 差异(Diff)(&D)
205+menutrans Ma&rker 记号(Marker)(&R)
200206 " }}}
201207 " create and delete folds
202-menutrans Create\ &Fold<Tab>zf 创建折叠(&F)<Tab>zf
203-menutrans &Delete\ Fold<Tab>zd 删除折叠(&D)<Tab>zd
204-menutrans Delete\ &All\ Folds<Tab>zD 删除全部折叠(&A)<Tab>zD
208+menutrans Create\ &Fold<Tab>zf 创建折叠(&F)<Tab>zf
209+menutrans &Delete\ Fold<Tab>zd 删除折叠(&D)<Tab>zd
210+menutrans Delete\ &All\ Folds<Tab>zD 删除全部折叠(&A)<Tab>zD
205211 " moving around in folds
206-menutrans Fold\ Col&umn\ Width 折叠操作栏宽度(&W)
212+menutrans Fold\ Col&umn\ Width 折叠操作栏宽度(&W)
207213 " }}}
208214
209215 " Tools.Diff Menu
210-menutrans &Diff 差异(Diff)(&D)
216+menutrans &Diff 差异(Diff)(&D)
211217 " Tools.Diff menuitems {{{2
212-menutrans &Update 刷新(&U)
213-menutrans &Get\ Block 采用对侧文本块(&G)
214-menutrans &Put\ Block 采用本侧文本块(&P)
218+menutrans &Update 刷新(&U)
219+menutrans &Get\ Block 采用对侧文本块(&G)
220+menutrans &Put\ Block 采用本侧文本块(&P)
215221 " }}}
216222
217-menutrans &Make<Tab>:make 生成(Make)(&M)<Tab>:make
218-menutrans &List\ Errors<Tab>:cl 列出错误(&L)<Tab>:cl
219-menutrans L&ist\ Messages<Tab>:cl! 列出消息(&I)<Tab>:cl!
220-menutrans &Next\ Error<Tab>:cn 下一个错误(&N)<Tab>:cn
221-menutrans &Previous\ Error<Tab>:cp 上一个错误(&P)<Tab>:cp
222-menutrans &Older\ List<Tab>:cold 较旧的错误列表(&O)<Tab>:cold
223-menutrans N&ewer\ List<Tab>:cnew 较新的错误列表(&E)<Tab>:cnew
224-menutrans Error\ &Window 错误窗口(&W)
223+menutrans &Make<Tab>:make 生成(Make)(&M)<Tab>:make
224+menutrans &List\ Errors<Tab>:cl 列出错误(&L)<Tab>:cl
225+menutrans L&ist\ Messages<Tab>:cl! 列出消息(&I)<Tab>:cl!
226+menutrans &Next\ Error<Tab>:cn 下一个错误(&N)<Tab>:cn
227+menutrans &Previous\ Error<Tab>:cp 上一个错误(&P)<Tab>:cp
228+menutrans &Older\ List<Tab>:cold 较旧的错误列表(&O)<Tab>:cold
229+menutrans N&ewer\ List<Tab>:cnew 较新的错误列表(&E)<Tab>:cnew
230+menutrans Error\ &Window 错误窗口(&W)
225231 " Tools.Error Window menuitems {{{2
226-menutrans &Update<Tab>:cwin 刷新(&U)<Tab>:cwin
227-menutrans &Open<Tab>:copen 打开(&O)<Tab>:copen
228-menutrans &Close<Tab>:cclose 关闭(&C)<Tab>:cclose
232+menutrans &Update<Tab>:cwin 刷新(&U)<Tab>:cwin
233+menutrans &Open<Tab>:copen 打开(&O)<Tab>:copen
234+menutrans &Close<Tab>:cclose 关闭(&C)<Tab>:cclose
229235 " }}}
230-menutrans Show\ Compiler\ Se&ttings\ in\ Menu 在菜单中显示编译器设置(&T)
231-menutrans Se&t\ Compiler 设置编译器(&T)
232-menutrans &Convert\ to\ HEX<Tab>:%!xxd 转换成十六进制(&C)<Tab>:%!xxd
233-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r 转换回(&R)<Tab>:%!xxd\ -r
236+menutrans Show\ Compiler\ Se&ttings\ in\ Menu 在菜单中显示编译器设置(&T)
237+menutrans Se&t\ Compiler 设置编译器(&T)
238+menutrans &Convert\ to\ HEX<Tab>:%!xxd 转换成十六进制(&C)<Tab>:%!xxd
239+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r 转换回(&R)<Tab>:%!xxd\ -r
234240 " }}}
235241
236242 " Buffer menu
237-menutrans &Buffers 缓冲区(&B)
243+menutrans &Buffers 缓冲区(&B)
238244 " Buffer menuitems and dialog {{{1
239-menutrans &Refresh\ Menu 刷新本菜单(&R)
240-menutrans &Delete 删除(&D)
241-menutrans &Alternate 切换(&A)
242-menutrans &Next 下一个(&N)
243-menutrans &Previous 上一个(&P)
245+menutrans &Refresh\ Menu 刷新本菜单(&R)
246+menutrans &Delete 删除(&D)
247+menutrans &Alternate 切换(&A)
248+menutrans &Next 下一个(&N)
249+menutrans &Previous 上一个(&P)
244250
245-" func! s:BMMunge(fname, bnum)
251+" func! s:BMMunge(fname, bnum)
246252 if !exists("g:menutrans_no_file")
247253 let g:menutrans_no_file = "[无文件]"
248254 endif
249255 " }}}
250256
251257 " Window menu
252-menutrans &Window 窗口(&W)
258+menutrans &Window 窗口(&W)
253259 " Window menuitems {{{1
254-menutrans &New<Tab>^Wn 新建(&N)<Tab>^Wn
255-menutrans S&plit<Tab>^Ws 拆分(&P)<Tab>^Ws
256-menutrans Sp&lit\ To\ #<Tab>^W^^ 拆分并显示缓冲区\ #(&L)<Tab>^W^^
257-menutrans Split\ &Vertically<Tab>^Wv 垂直拆分(&V)<Tab>^Wv
258-menutrans Split\ File\ E&xplorer 拆分并打开文件浏览器(&X)
259-menutrans &Close<Tab>^Wc 关闭(&C)<Tab>^Wc
260-menutrans Close\ &Other(s)<Tab>^Wo 除此之外全部关闭(&O)<Tab>^Wo
261-menutrans Move\ &To 移动到(&T)
262-menutrans &Top<Tab>^WK 顶端(&T)<Tab>^WK
263-menutrans &Bottom<Tab>^WJ 底端(&B)<Tab>^WJ
264-menutrans &Left\ Side<Tab>^WH 左边(&L)<Tab>^WH
265-menutrans &Right\ Side<Tab>^WL 右边(&R)<Tab>^WL
266-menutrans Rotate\ &Up<Tab>^WR 向上轮换(&U)<Tab>^WR
267-menutrans Rotate\ &Down<Tab>^Wr 向下轮换(&D)<Tab>^Wr
268-menutrans &Equal\ Size<Tab>^W= 平均分布(&E)<Tab>^W=
269-menutrans &Max\ Height<Tab>^W_ 最大高度(&M)<Tab>^W
270-menutrans M&in\ Height<Tab>^W1_ 最小高度(&I)<Tab>^W1_
271-menutrans Max\ &Width<Tab>^W\| 最大宽度(&W)<Tab>^W\|
272-menutrans Min\ Widt&h<Tab>^W1\| 最小宽度(&H)<Tab>^W1\|
260+menutrans &New<Tab>^Wn 新建(&N)<Tab>^Wn
261+menutrans S&plit<Tab>^Ws 拆分(&P)<Tab>^Ws
262+menutrans Sp&lit\ To\ #<Tab>^W^^ 拆分并显示缓冲区\ #(&L)<Tab>^W^^
263+menutrans Split\ &Vertically<Tab>^Wv 垂直拆分(&V)<Tab>^Wv
264+menutrans Split\ File\ E&xplorer 拆分并打开文件浏览器(&X)
265+menutrans &Close<Tab>^Wc 关闭(&C)<Tab>^Wc
266+menutrans Close\ &Other(s)<Tab>^Wo 除此之外全部关闭(&O)<Tab>^Wo
267+menutrans Move\ &To 移动到(&T)
268+menutrans &Top<Tab>^WK 顶端(&T)<Tab>^WK
269+menutrans &Bottom<Tab>^WJ 底端(&B)<Tab>^WJ
270+menutrans &Left\ Side<Tab>^WH 左边(&L)<Tab>^WH
271+menutrans &Right\ Side<Tab>^WL 右边(&R)<Tab>^WL
272+menutrans Rotate\ &Up<Tab>^WR 向上轮换(&U)<Tab>^WR
273+menutrans Rotate\ &Down<Tab>^Wr 向下轮换(&D)<Tab>^Wr
274+menutrans &Equal\ Size<Tab>^W= 平均分布(&E)<Tab>^W=
275+menutrans &Max\ Height<Tab>^W_ 最大高度(&M)<Tab>^W
276+menutrans M&in\ Height<Tab>^W1_ 最小高度(&I)<Tab>^W1_
277+menutrans Max\ &Width<Tab>^W\| 最大宽度(&W)<Tab>^W\|
278+menutrans Min\ Widt&h<Tab>^W1\| 最小宽度(&H)<Tab>^W1\|
273279 " }}}
274280
275281 " The popup menu {{{1
276-menutrans &Undo 撤销(&U)
277-menutrans Cu&t 剪切(&T)
278-menutrans &Copy 复制(&C)
279-menutrans &Paste 粘贴(&P)
280-menutrans &Delete 删除(&D)
281-menutrans Select\ Blockwise 改为选定矩形块
282-menutrans Select\ &Word 选定单词(&W)
283-menutrans Select\ &Sentence 选定句(&S)
284-menutrans Select\ Pa&ragraph 选定段落(&R)
285-menutrans Select\ &Line 选定行(&L)
286-menutrans Select\ &Block 选定矩形块(&B)
287-menutrans Select\ &All 全选(&A)
282+menutrans &Undo 撤销(&U)
283+menutrans Cu&t 剪切(&T)
284+menutrans &Copy 复制(&C)
285+menutrans &Paste 粘贴(&P)
286+menutrans &Delete 删除(&D)
287+menutrans Select\ Blockwise 改为选定矩形块
288+menutrans Select\ &Word 选定单词(&W)
289+menutrans Select\ &Sentence 选定句(&S)
290+menutrans Select\ Pa&ragraph 选定段落(&R)
291+menutrans Select\ &Line 选定行(&L)
292+menutrans Select\ &Block 选定矩形块(&B)
293+menutrans Select\ &All 全选(&A)
288294
289295 " func! <SID>SpellPopup()
290296 if !exists("g:menutrans_spell_change_ARG_to")
@@ -305,148 +311,255 @@
305311 endif
306312 fun Do_toolbar_tmenu()
307313 let did_toolbar_tmenu = 1
308- tmenu ToolBar.Open 打开文件
309- tmenu ToolBar.Save 保存当前文件
310- tmenu ToolBar.SaveAll 全部保存
311- tmenu ToolBar.Print 打印
312- tmenu ToolBar.Undo 撤销
313- tmenu ToolBar.Redo 恢复
314- tmenu ToolBar.Cut 剪切到剪贴板
315- tmenu ToolBar.Copy 复制到剪贴板
316- tmenu ToolBar.Paste 从剪贴板粘贴
314+ tmenu ToolBar.Open 打开文件
315+ tmenu ToolBar.Save 保存当前文件
316+ tmenu ToolBar.SaveAll 全部保存
317+ tmenu ToolBar.Print 打印
318+ tmenu ToolBar.Undo 撤销
319+ tmenu ToolBar.Redo 恢复
320+ tmenu ToolBar.Cut 剪切到剪贴板
321+ tmenu ToolBar.Copy 复制到剪贴板
322+ tmenu ToolBar.Paste 从剪贴板粘贴
317323 if !has("gui_athena")
318- tmenu ToolBar.Replace 查找和替换...
319- tmenu ToolBar.FindNext 查找下一个
320- tmenu ToolBar.FindPrev 查找上一个
324+ tmenu ToolBar.Replace 查找和替换...
325+ tmenu ToolBar.FindNext 查找下一个
326+ tmenu ToolBar.FindPrev 查找上一个
321327 endif
322- tmenu ToolBar.LoadSesn 加载会话
323- tmenu ToolBar.SaveSesn 保存当前会话
324- tmenu ToolBar.RunScript 运行 Vim 脚本
325- tmenu ToolBar.Make 生成当前项目 (:make)
326- tmenu ToolBar.RunCtags 在当前目录生成标记(Tags) (!ctags -R .)
327- tmenu ToolBar.TagJump 跳转到光标所在标记(Tag)
328- tmenu ToolBar.Help Vim 帮助
329- tmenu ToolBar.FindHelp 在 Vim 帮助中查找
328+ tmenu ToolBar.LoadSesn 加载会话
329+ tmenu ToolBar.SaveSesn 保存当前会话
330+ tmenu ToolBar.RunScript 运行 Vim 脚本
331+ tmenu ToolBar.Make 生成当前项目 (:make)
332+ tmenu ToolBar.RunCtags 在当前目录生成标记(Tags) (!ctags -R .)
333+ tmenu ToolBar.TagJump 跳转到光标所在标记(Tag)
334+ tmenu ToolBar.Help Vim 帮助
335+ tmenu ToolBar.FindHelp 在 Vim 帮助中查找
330336 endfun
331337 endif
332338 " }}}
333339
334340 " Syntax menu
335-menutrans &Syntax 语法(&S)
341+menutrans &Syntax 语法(&S)
336342 " Syntax menuitems {{{1
337-menutrans &Show\ File\ Types\ in\ Menu 在菜单中显示文件类型(&S)
338-menutrans &Off 关闭(&O)
339-menutrans &Manual 手动(&M)
340-menutrans A&utomatic 自动(&U)
341-menutrans On/Off\ for\ &This\ File 只对这个文件开/关(&T)
342-menutrans Co&lor\ Test 色彩测试(&L)
343-menutrans &Highlight\ Test 高亮测试(&H)
344-menutrans &Convert\ to\ HTML 转换成\ HTML(&C)
343+menutrans &Show\ File\ Types\ in\ Menu 在菜单中显示文件类型(&S)
344+menutrans &Off 关闭(&O)
345+menutrans &Manual 手动(&M)
346+menutrans A&utomatic 自动(&U)
347+menutrans On/Off\ for\ &This\ File 只对这个文件开/关(&T)
348+menutrans Co&lor\ Test 色彩测试(&L)
349+menutrans &Highlight\ Test 高亮测试(&H)
350+menutrans &Convert\ to\ HTML 转换成\ HTML(&C)
351+
345352 " From synmenu.vim
346-menutrans Set\ '&syntax'\ Only 只设置\ 'syntax'(&S)
347-menutrans Set\ '&filetype'\ Too 也设置\ 'filetype'(&F)
353+menutrans Set\ '&syntax'\ Only 只设置\ 'syntax'(&S)
354+menutrans Set\ '&filetype'\ Too 也设置\ 'filetype'(&F)
355+menutrans Oracle\ config Oracle\ 配置文件
356+menutrans Vim\ help\ file Vim\ 帮助文件
357+menutrans Vim\ script Vim\ 脚本
358+menutrans Viminfo\ file Vim\ 信息文件
359+menutrans Virata\ config Virata\ 配置文件
348360 " }}}
349361
350362 " Netrw menu {{{1
351363 " Plugin loading may be after menu translation
352364 " So giveup testing if Netrw Plugin is loaded
353365 " if exists("g:loaded_netrwPlugin")
354- menutrans Help<tab><F1> 帮助<tab><F1>
355- menutrans Bookmarks 书签
356- menutrans History 历史记录
357- menutrans Go\ Up\ Directory<tab>- 向上一级<tab>-
358- menutrans Apply\ Special\ Viewer<tab>x 用默认程序打开<tab>x
359- menutrans Bookmarks\ and\ History 书签和历史记录
366+ menutrans Help<tab><F1> 帮助<tab><F1>
367+ menutrans Bookmarks 书签
368+ menutrans History 历史记录
369+ menutrans Go\ Up\ Directory<tab>- 向上一级<tab>-
370+ menutrans Apply\ Special\ Viewer<tab>x 用默认程序打开<tab>x
371+ menutrans Bookmarks\ and\ History 书签和历史记录
360372 " Netrw.Bookmarks and History menuitems {{{2
361- menutrans Bookmark\ Current\ Directory<tab>mb 添加书签<tab>mb
362- menutrans Bookmark\ Delete 移除书签
363- menutrans Goto\ Prev\ Dir\ (History)<tab>u 后退(历史记录)<tab>u
364- menutrans Goto\ Next\ Dir\ (History)<tab>U 前进(历史记录)<tab>U
365- menutrans List<tab>qb 完整列表<tab>qb
373+ menutrans Bookmark\ Current\ Directory<tab>mb 添加书签<tab>mb
374+ menutrans Bookmark\ Delete 移除书签
375+ menutrans Goto\ Prev\ Dir\ (History)<tab>u 后退(历史记录)<tab>u
376+ menutrans Goto\ Next\ Dir\ (History)<tab>U 前进(历史记录)<tab>U
377+ menutrans List<tab>qb 完整列表<tab>qb
366378 " }}}
367- menutrans Browsing\ Control 控制
379+ menutrans Browsing\ Control 控制
368380 " Netrw.Browsing Control menuitems {{{2
369- menutrans Horizontal\ Split<tab>o 在拆分窗口打开<tab>o
370- menutrans Vertical\ Split<tab>v 在垂直拆分窗口打开<tab>v
371- menutrans New\ Tab<tab>t 在标签页打开<tab>t
372- menutrans Preview<tab>p 预览<tab>p
373- menutrans Edit\ File\ Hiding\ List<tab><ctrl-h> 编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
374- menutrans Edit\ Sorting\ Sequence<tab>S 编辑排序条件(Sorting\ Sequence)<tab>S
375- menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh 快速隐藏/显示以\.开头的文件<tab>gh
376- menutrans Refresh\ Listing<tab><ctrl-l> 刷新<tab><ctrl-l>
377- menutrans Settings/Options<tab>:NetrwSettings 设置/选项<tab>:NetrwSettings
381+ menutrans Horizontal\ Split<tab>o 在拆分窗口打开<tab>o
382+ menutrans Vertical\ Split<tab>v 在垂直拆分窗口打开<tab>v
383+ menutrans New\ Tab<tab>t 在标签页打开<tab>t
384+ menutrans Preview<tab>p 预览<tab>p
385+ menutrans Edit\ File\ Hiding\ List<tab><ctrl-h> 编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
386+ menutrans Edit\ Sorting\ Sequence<tab>S 编辑排序条件(Sorting\ Sequence)<tab>S
387+ menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh 快速隐藏/显示以\.开头的文件<tab>gh
388+ menutrans Refresh\ Listing<tab><ctrl-l> 刷新<tab><ctrl-l>
389+ menutrans Settings/Options<tab>:NetrwSettings 设置/选项<tab>:NetrwSettings
378390 " }}}
379- menutrans Delete\ File/Directory<tab>D 删除文件/目录<tab>D
380- menutrans Edit\ File/Dir 编辑文件/目录
391+ menutrans Delete\ File/Directory<tab>D 删除文件/目录<tab>D
392+ menutrans Edit\ File/Dir 编辑文件/目录
381393 " Netrw.Edit File menuitems {{{2
382- menutrans Create\ New\ File<tab>% 新建文件<tab>%
383- menutrans In\ Current\ Window<tab><cr> 在当前窗口<tab><cr>
384- menutrans Preview\ File/Directory<tab>p 预览文件/目录<tab>p
385- menutrans In\ Previous\ Window<tab>P 在上一个窗口<tab>P
386- menutrans In\ New\ Window<tab>o 在新窗口<tab>o
387- menutrans In\ New\ Tab<tab>t 在新标签页<tab>t
388- menutrans In\ New\ Vertical\ Window<tab>v 在新垂直窗口<tab>v
394+ menutrans Create\ New\ File<tab>% 新建文件<tab>%
395+ menutrans In\ Current\ Window<tab><cr> 在当前窗口<tab><cr>
396+ menutrans Preview\ File/Directory<tab>p 预览文件/目录<tab>p
397+ menutrans In\ Previous\ Window<tab>P 在上一个窗口<tab>P
398+ menutrans In\ New\ Window<tab>o 在新窗口<tab>o
399+ menutrans In\ New\ Tab<tab>t 在新标签页<tab>t
400+ menutrans In\ New\ Vertical\ Window<tab>v 在新垂直窗口<tab>v
389401 " }}}
390- menutrans Explore 浏览
402+ menutrans Explore 浏览
391403 " Netrw.Explore menuitems {{{2
392- menutrans Directory\ Name 指定目录名
393- menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */ 匹配指定文件名模式(当前目录)<tab>:Explore\ */
394- menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/ 匹配指定文件名模式(含子目录)<tab>:Explore\ **/
395- menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *// 内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
396- menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **// 内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
397- menutrans Next\ Match<tab>:Nexplore 下一个匹配项<tab>:Nexplore
398- menutrans Prev\ Match<tab>:Pexplore 上一个匹配项<tab>:Pexplore
404+ menutrans Directory\ Name 指定目录名
405+ menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */ 匹配指定文件名模式(当前目录)<tab>:Explore\ */
406+ menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/ 匹配指定文件名模式(含子目录)<tab>:Explore\ **/
407+ menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *// 内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
408+ menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **// 内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
409+ menutrans Next\ Match<tab>:Nexplore 下一个匹配项<tab>:Nexplore
410+ menutrans Prev\ Match<tab>:Pexplore 上一个匹配项<tab>:Pexplore
399411 " }}}
400- menutrans Make\ Subdirectory<tab>d 新建子目录<tab>d
401- menutrans Marked\ Files 选定的(Marked)文件
412+ menutrans Make\ Subdirectory<tab>d 新建子目录<tab>d
413+ menutrans Marked\ Files 选定的(Marked)文件
402414 " Netrw.Marked Files menuitems {{{2
403- menutrans Mark\ File<tab>mf 选定(Mark)/取消<tab>mf
404- menutrans Mark\ Files\ by\ Regexp<tab>mr 用正则表达式(Regexp)选定<tab>mr
405- menutrans Hide-Show-List\ Control<tab>a 隐藏/显示<tab>a
406- menutrans Copy\ To\ Target<tab>mc 复制到目标<tab>mc
407- menutrans Delete<tab>D 删除<tab>D
408- menutrans Diff<tab>md 差异(Diff)<tab>md
409- menutrans Edit<tab>me 编辑<tab>me
410- menutrans Exe\ Cmd<tab>mx 作为参数运行命令<tab>mx
411- menutrans Move\ To\ Target<tab>mm 移动到目标<tab>mm
412- menutrans Obtain<tab>O 获取<tab>O
413- menutrans Print<tab>mp 打印<tab>mp
414- menutrans Replace<tab>R 替换<tab>R
415- menutrans Set\ Target<tab>mt 设置目标<tab>mt
416- menutrans Tag<tab>mT 生成标记文件(Tags)<tab>mT
417- menutrans Zip/Unzip/Compress/Uncompress<tab>mz 压缩/解压缩<tab>mz
415+ menutrans Mark\ File<tab>mf 选定(Mark)/取消<tab>mf
416+ menutrans Mark\ Files\ by\ Regexp<tab>mr 用正则表达式(Regexp)选定<tab>mr
417+ menutrans Hide-Show-List\ Control<tab>a 隐藏/显示<tab>a
418+ menutrans Copy\ To\ Target<tab>mc 复制到目标<tab>mc
419+ menutrans Delete<tab>D 删除<tab>D
420+ menutrans Diff<tab>md 差异(Diff)<tab>md
421+ menutrans Edit<tab>me 编辑<tab>me
422+ menutrans Exe\ Cmd<tab>mx 作为参数运行命令<tab>mx
423+ menutrans Move\ To\ Target<tab>mm 移动到目标<tab>mm
424+ menutrans Obtain<tab>O 获取<tab>O
425+ menutrans Print<tab>mp 打印<tab>mp
426+ menutrans Replace<tab>R 替换<tab>R
427+ menutrans Set\ Target<tab>mt 设置目标<tab>mt
428+ menutrans Tag<tab>mT 生成标记文件(Tags)<tab>mT
429+ menutrans Zip/Unzip/Compress/Uncompress<tab>mz 压缩/解压缩<tab>mz
418430 " }}}
419- menutrans Obtain\ File<tab>O 获取文件<tab>O
420- menutrans Style 显示风格
431+ menutrans Obtain\ File<tab>O 获取文件<tab>O
432+ menutrans Style 显示风格
421433 " Netrw.Style menuitems {{{2
422- menutrans Listing 列表形式
434+ menutrans Listing 列表形式
423435 " Netrw.Style.Listing menuitems {{{3
424- menutrans thin<tab>i 紧凑<thin)<tab>i
425- menutrans long<tab>i 详细(long)<tab>i
426- menutrans wide<tab>i 多列(wide)<tab>i
427- menutrans tree<tab>i 树状(tree)<tab>i
436+ menutrans thin<tab>i 紧凑<thin)<tab>i
437+ menutrans long<tab>i 详细(long)<tab>i
438+ menutrans wide<tab>i 多列(wide)<tab>i
439+ menutrans tree<tab>i 树状(tree)<tab>i
428440 " }}}
429- menutrans Normal-Hide-Show 显示/隐藏
441+ menutrans Normal-Hide-Show 显示/隐藏
430442 " Netrw.Style.Normal-Hide_show menuitems {{{3
431- menutrans Show\ All<tab>a 显示全部
432- menutrans Normal<tab>a 不显示隐藏文件
433- menutrans Hidden\ Only<tab>a 只显示隐藏文件
443+ menutrans Show\ All<tab>a 显示全部
444+ menutrans Normal<tab>a 不显示隐藏文件
445+ menutrans Hidden\ Only<tab>a 只显示隐藏文件
434446 " }}}
435- menutrans Reverse\ Sorting\ Order<tab>r 升序/降序<tab>r
436- menutrans Sorting\ Method 排序方式
447+ menutrans Reverse\ Sorting\ Order<tab>r 升序/降序<tab>r
448+ menutrans Sorting\ Method 排序方式
437449 " Netrw.Style.Sorting Method menuitems {{{3
438- menutrans Name<tab>s 文件名<tab>s
439- menutrans Time<tab>s 修改时间<tab>s
440- menutrans Size<tab>s 大小<tab>s
441- menutrans Exten<tab>s 扩展名<tab>s
450+ menutrans Name<tab>s 文件名<tab>s
451+ menutrans Time<tab>s 修改时间<tab>s
452+ menutrans Size<tab>s 大小<tab>s
453+ menutrans Exten<tab>s 扩展名<tab>s
442454 " }}}
443455 " }}}
444- menutrans Rename\ File/Directory<tab>R 重命名文件/目录<tab>R
445- menutrans Set\ Current\ Directory<tab>c 设置\ Vim\ 工作目录<tab>c
446- menutrans Targets 目标
456+ menutrans Rename\ File/Directory<tab>R 重命名文件/目录<tab>R
457+ menutrans Set\ Current\ Directory<tab>c 设置\ Vim\ 工作目录<tab>c
458+ menutrans Targets 目标
447459 " endif
448460 " }}}
449461
462+" Shellmenu menu
463+" Shellmenu menuitems {{{1
464+" From shellmenu.vim
465+menutrans Stmts 语句
466+menutrans Test 测试
467+menutrans existence 存在
468+menutrans existence\ -\ file 存在\ -\ 文件
469+menutrans existence\ -\ file\ (not\ empty) 存在\ -\ 文件(非空)
470+menutrans existence\ -\ directory 存在\ -\ 目录
471+menutrans existence\ -\ executable 存在\ -\ 可执行
472+menutrans existence\ -\ readable 存在\ -\ 可读
473+menutrans existence\ -\ writable 存在\ -\ 可写
474+menutrans String\ is\ empty 字符串为空
475+menutrans String\ is\ not\ empty 字符串非空
476+menutrans Strings\ is\ equal 字符串值相等
477+menutrans Strings\ is\ not\ equal 字符串值不相等
478+menutrans Values\ is\ greater\ than 值大于
479+menutrans Values\ is\ greater\ equal 值大于等于
480+menutrans Values\ is\ equal 值相等
481+menutrans Values\ is\ not\ equal 值不相等
482+menutrans Values\ is\ less\ than 值小于
483+menutrans Values\ is\ less\ equal 值小于等于
484+menutrans ParmSub 参数替换
485+menutrans Substitute\ word\ if\ parm\ not\ set 如果参数没设置就替换该词
486+menutrans Set\ parm\ to\ word\ if\ not\ set 参数未设置就设为该词
487+menutrans Substitute\ word\ if\ parm\ set\ else\ nothing 如果参数设置就替换该词,否则什么都不做
488+menutrans If\ parm\ not\ set\ print\ word\ and\ exit 如果参数没有设置就打印该词并退出
489+menutrans SpShVars Shell\ 特殊变量
490+menutrans Number\ of\ positional\ parameters 位置参数的数目
491+menutrans All\ positional\ parameters\ (quoted\ spaces) 所有位置参数(quoted\ spaces)
492+menutrans All\ positional\ parameters\ (unquoted\ spaces) 所有位置参数(unquoted\ spaces)
493+menutrans Flags\ set 设置标志
494+menutrans Return\ code\ of\ last\ command 返回前一条命令的代码
495+menutrans Process\ number\ of\ this\ shell shell\ 自身进程号
496+menutrans Process\ number\ of\ last\ background\ command 前一条后台命令的进程号
497+menutrans Environ 环境变量
498+menutrans exit\ when\ command\ returns\ non-zero\ exit\ code 当命令返回非零代码时退出
499+menutrans Disable\ file\ name\ generation 禁用文件名生成
500+menutrans Read\ commands\ but\ do\ not\ execute\ them 读命令但是不要执行
501+menutrans Exit\ after\ reading\ and\ executing\ one\ command 读并执行一个命令之后退出
502+menutrans Treat\ unset\ variables\ as\ an\ error\ when\ substituting 替换时把未设置命令视为错误
503+menutrans Print\ shell\ input\ lines\ as\ they\ are\ read 读\ shell\ 输入行的时候打印
504+menutrans Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed 被执行时打印命令和参数
505+" }}}
506+
507+" termdebug menu
508+" termdebug menuitems {{{1
509+" From termdebug.vim
510+menutrans Set\ breakpoint 设置断点
511+menutrans Clear\ breakpoint 清除断点
512+menutrans Run\ until 运行到
513+menutrans Evaluate 求值
514+menutrans WinBar 工具条
515+menutrans Step 单步
516+menutrans Next 下一个
517+menutrans Finish 结束
518+menutrans Cont 继续
519+menutrans Stop 停止
520+" }}}
521+
522+" debchangelog menu
523+" debchangelog menuitems {{{1
524+" From debchangelog.vim
525+menutrans &Changelog 更新日志(&C)
526+menutrans &New\ Version 新版本(&N)
527+menutrans &Add\ Entry 添加条目(&A)
528+menutrans &Close\ Bug 关闭\ Bug(&C)
529+menutrans Set\ &Distribution 设置发行版(&D)
530+menutrans &unstable 不稳定(&U)
531+menutrans Set\ &Urgency 设置紧急(&U)
532+menutrans &low 低(&L)
533+menutrans &medium 中(&M)
534+menutrans &high 高(&H)
535+menutrans U&nfinalise 未完成(&N)
536+menutrans &Finalise 完成(&F)
537+" }}}
538+
539+" ada menu
540+" ada menuitems {{{1
541+" From ada.vim
542+menutrans Tag 标签
543+menutrans List 列表
544+menutrans Jump 跳转
545+menutrans Create\ File 创建文件
546+menutrans Create\ Dir 创建目录
547+menutrans Highlight 高亮
548+menutrans Toggle\ Space\ Errors 切换空格错误
549+menutrans Toggle\ Lines\ Errors 切换行错误
550+menutrans Toggle\ Rainbow\ Color 切换彩虹颜色
551+menutrans Toggle\ Standard\ Types 切换标准类型
552+" }}}
553+
554+" gnat menu
555+" gnat menuitems {{{1
556+" From gnat.vim
557+menutrans Build 构建
558+menutrans Pretty\ Print 重新格式化代码
559+menutrans Find 查找
560+menutrans Set\ Projectfile\.\.\. 设置项目文件\.\.\.
561+" }}}
562+
450563 let &cpo = s:keepcpo
451564 unlet s:keepcpo
452565
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/syntax/fetchmail.vim
--- a/runtime/syntax/fetchmail.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/syntax/fetchmail.vim Wed Jul 06 14:30:05 2022 +0200
@@ -2,7 +2,7 @@
22 " Language: fetchmail(1) RC File
33 " Maintainer: Doug Kearns <dougkearns@gmail.com>
44 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
5-" Latest Revision: 2022 Jun 30
5+" Latest Revision: 2022 Jul 02
66
77 " Version 6.4.3
88
@@ -62,7 +62,7 @@
6262 syn keyword fetchmailSet nextgroup=fetchmailOptions skipwhite skipnl set
6363
6464 syn keyword fetchmailOptions daemon postmaster bouncemail spambounce
65- \ softbounce logfile idfile syslog properties
65+ \ softbounce logfile pidfile idfile syslog properties
6666 syn match fetchmailOptions '\<no\_s\+\(bouncemail\|spambounce\|softbounce\|syslog\)'
6767
6868 hi def link fetchmailComment Comment
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/syntax/sh.vim
--- a/runtime/syntax/sh.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/syntax/sh.vim Wed Jul 06 14:30:05 2022 +0200
@@ -2,8 +2,8 @@
22 " Language: shell (sh) Korn shell (ksh) bash (sh)
33 " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
44 " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
5-" Last Change: Jun 09, 2022
6-" Version: 201
5+" Last Change: Jun 29, 2022
6+" Version: 202
77 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
88 " For options and settings, please use: :help ft-sh-syntax
99 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
@@ -350,7 +350,7 @@
350350 syn cluster shCommandSubList add=bashSpecialVariables,bashStatement
351351 syn cluster shCaseList add=bashAdminStatement,bashStatement
352352 syn keyword bashSpecialVariables contained auto_resume BASH BASH_ALIASES BASH_ALIASES BASH_ARGC BASH_ARGC BASH_ARGV BASH_ARGV BASH_CMDS BASH_CMDS BASH_COMMAND BASH_COMMAND BASH_ENV BASH_EXECUTION_STRING BASH_EXECUTION_STRING BASH_LINENO BASH_LINENO BASHOPTS BASHOPTS BASHPID BASHPID BASH_REMATCH BASH_REMATCH BASH_SOURCE BASH_SOURCE BASH_SUBSHELL BASH_SUBSHELL BASH_VERSINFO BASH_VERSION BASH_XTRACEFD BASH_XTRACEFD CDPATH COLUMNS COLUMNS COMP_CWORD COMP_CWORD COMP_KEY COMP_KEY COMP_LINE COMP_LINE COMP_POINT COMP_POINT COMPREPLY COMPREPLY COMP_TYPE COMP_TYPE COMP_WORDBREAKS COMP_WORDBREAKS COMP_WORDS COMP_WORDS COPROC COPROC DIRSTACK EMACS EMACS ENV ENV EUID FCEDIT FIGNORE FUNCNAME FUNCNAME FUNCNEST FUNCNEST GLOBIGNORE GROUPS histchars HISTCMD HISTCONTROL HISTFILE HISTFILESIZE HISTIGNORE HISTSIZE HISTTIMEFORMAT HISTTIMEFORMAT HOME HOSTFILE HOSTNAME HOSTTYPE IFS IGNOREEOF INPUTRC LANG LC_ALL LC_COLLATE LC_CTYPE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_NUMERIC LINENO LINES LINES MACHTYPE MAIL MAILCHECK MAILPATH MAPFILE MAPFILE OLDPWD OPTARG OPTERR OPTIND OSTYPE PATH PIPESTATUS POSIXLY_CORRECT POSIXLY_CORRECT PPID PROMPT_COMMAND PS1 PS2 PS3 PS4 PWD RANDOM READLINE_LINE READLINE_LINE READLINE_POINT READLINE_POINT REPLY SECONDS SHELL SHELL SHELLOPTS SHLVL TIMEFORMAT TIMEOUT TMPDIR TMPDIR UID
353- syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep less ls mkdir mv rm rmdir rpm sed sleep sort strip tail
353+ syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep head less ls mkdir mv rm rmdir rpm sed sleep sort strip tail
354354 syn keyword bashAdminStatement daemon killall killproc nice reload restart start status stop
355355 syn keyword bashStatement command compgen
356356 endif
@@ -359,7 +359,7 @@
359359 syn cluster shCommandSubList add=kshSpecialVariables,kshStatement
360360 syn cluster shCaseList add=kshStatement
361361 syn keyword kshSpecialVariables contained CDPATH COLUMNS EDITOR ENV ERRNO FCEDIT FPATH HISTFILE HISTSIZE HOME IFS LINENO LINES MAIL MAILCHECK MAILPATH OLDPWD OPTARG OPTIND PATH PPID PS1 PS2 PS3 PS4 PWD RANDOM REPLY SECONDS SHELL TMOUT VISUAL
362- syn keyword kshStatement cat chmod clear cp du egrep expr fgrep find grep killall less ls mkdir mv nice printenv rm rmdir sed sort strip stty tail tput
362+ syn keyword kshStatement cat chmod clear cp du egrep expr fgrep find grep head killall less ls mkdir mv nice printenv rm rmdir sed sort strip stty tail tput
363363 syn keyword kshStatement command setgroups setsenv
364364 endif
365365
diff -r cc9945ae0971 -r 03e3b0034e31 runtime/syntax/vim.vim
--- a/runtime/syntax/vim.vim Wed Jul 06 14:00:06 2022 +0200
+++ b/runtime/syntax/vim.vim Wed Jul 06 14:30:05 2022 +0200
@@ -1,8 +1,8 @@
11 " Vim syntax file
2-" Language: Vim 8.2 script
2+" Language: Vim 9.0 script
33 " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
4-" Last Change: Jun 16, 20222
5-" Version: 8.2-46
4+" Last Change: July 01, 2022
5+" Version: 9.0-01
66 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
77 " Automatically generated keyword lists: {{{1
88
@@ -49,8 +49,8 @@
4949 syn keyword vimOption contained invakm invanti invarab invari invautochdir invautoshelldir invaw invballooneval invbevalterm invbk invbreakindent invcf invcindent invcopyindent invcscoperelative invcsre invcuc invcursorcolumn invdelcombine invdigraph inved invemo inveol invesckeys invexpandtab invfic invfixeol invfoldenable invgd invhid invhkmap invhls invicon invimc invimdisable invinfercase invjoinspaces invlangremap invlinebreak invlnr invlrm invmacatsui invml invmodeline invmodified
5050
5151 " termcap codes (which can also be set) {{{2
52-syn keyword vimOption contained t_8b t_8u t_AF t_AL t_bc t_BE t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_EI t_F2 t_F4 t_F6 t_F8 t_fd t_fs t_IE t_k1 t_k2 t_K3 t_K4 t_K5 t_K6 t_K7 t_K8 t_K9 t_kb t_KB t_kd t_KD t_KE t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_PE t_PS t_RB t_RC t_RF t_Ri t_RI t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_Si t_SI t_so t_sr t_SR t_ST t_te t_Te t_TE t_ti t_TI t_ts t_Ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_VS t_WP t_WS t_xn t_xs t_ZH t_ZR
53-syn keyword vimOption contained t_8f t_AB t_al t_AU t_BD t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EC t_F1 t_F3 t_F5 t_F7 t_F9 t_fe t_GP t_IS t_K1 t_k3 t_k4 t_k5 t_k6 t_k7 t_k8 t_k9 t_KA t_kB t_KC t_kD t_ke t_KF
52+syn keyword vimOption contained t_8b t_8u t_AF t_AL t_bc t_BE t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_Ds t_EI t_F2 t_F4 t_F6 t_F8 t_fd t_fs t_IE t_k1 t_k2 t_K3 t_K4 t_K5 t_K6 t_K7 t_K8 t_K9 t_kb t_KB t_kd t_KD t_KE t_KG t_KH t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_PE t_PS t_RB t_RC t_RF t_Ri t_RI t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_Si t_SI t_so t_sr t_SR t_ST t_te t_Te t_TE t_ti t_TI t_ts t_Ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_vs t_VS t_WP t_WS t_xn t_xs t_ZH t_ZR
53+syn keyword vimOption contained t_8f t_AB t_al t_AU t_BD t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_ds t_EC t_F1 t_F3 t_F5 t_F7 t_F9 t_fe t_GP t_IS t_K1 t_k3 t_k4 t_k5 t_k6 t_k7 t_k8 t_k9 t_KA t_kB t_KC t_kD t_ke t_KF t_kh t_kI
5454 syn match vimOption contained "t_%1"
5555 syn match vimOption contained "t_#2"
5656 syn match vimOption contained "t_#4"
@@ -400,7 +400,7 @@
400400 " Let: {{{2
401401 " ===
402402 syn keyword vimLet let unl[et] skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
403-VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\%(\s\+eval\)\=\|eval\%(\s\+trim\)\=\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'
403+VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\|eval\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'
404404
405405 " Abbreviations: {{{2
406406 " =============
Show on old repository browser