diff options
35 files changed, 1032 insertions, 704 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4918d5a8a5..90c5f75107 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -65,9 +65,6 @@ If the maintainer does not respond, contact the vim-dev maillist. # Translations -Translations of this CONTRIBUTING file: -[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/CONTRIBUTING_ko.md) - Translating messages and runtime files is very much appreciated! These things can be translated: * Messages in Vim, see [src/po/README.txt][1] @@ -128,6 +128,8 @@ If you would like to help making Vim better, see the ## Information ## +If you are on macOS, you can use [Macvim](https://macvim-dev.github.io/macvim/). + The latest news about Vim can be found on the Vim home page: https://www.vim.org/ @@ -150,8 +152,3 @@ Send any other comments, patches, flowers and suggestions to: This is `README.md` for version 9.0 of Vim: Vi IMproved. - - -## Translations of this README ## - -[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index d182f47d90..f700d4e9d3 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -5775,8 +5775,8 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]]) message will appear and the match will not be added. An ID is specified as a positive integer (zero excluded). IDs 1, 2 and 3 are reserved for |:match|, |:2match| and |:3match|, - respectively. 3 is reserved for use by the - |matchparen|polugin. + respectively. 3 is reserved for use by the |matchparen| + plugin. If the {id} argument is not specified or -1, |matchadd()| automatically chooses a free ID. @@ -7387,7 +7387,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) < When {stopline} is used and it is not zero this also implies that the search does not wrap around the end of the file. A zero value is equal to not giving the argument. - + *E1285* *E1286* *E1287* *E1288* *E1289* When the {timeout} argument is given the search stops when more than this many milliseconds have passed. Thus when {timeout} is 500 the search stops after half a second. diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 89a2491f0d..5ac2f63f7a 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -802,6 +802,8 @@ When the {string} starts with "\=" it is evaluated as an expression, see |sub-replace-expression|. You can use that for complex replacement or special characters. +The substitution is limited in recursion to 4 levels. *E1290* + Otherwise these characters in {string} have a special meaning: *:s%* When {string} is equal to "%" and '/' is included with the 'cpoptions' option, diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index 65dbd30f9b..5b4ea2bc96 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -27,6 +27,7 @@ The Netbeans interface also uses a channel. |netbeans| 14. Using a prompt buffer |prompt-buffer| 15. Language Server Protocol |language-server-protocol| + *E1277* {only when compiled with the |+channel| feature for channel stuff} You can check this with: `has('channel')` {only when compiled with the |+job| feature for job stuff} diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index ffb0832bd4..e09ec39a54 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1147,6 +1147,8 @@ character that indicates the type of command-line being edited, see Vim will be in Normal mode when the editor is opened, except when 'insertmode' is set. + *E1292* +Once a command-line window is open it is not possible to open another one. The height of the window is specified with 'cmdwinheight' (or smaller if there is no room). The window is always full width and is positioned just above the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 3dfacf7291..9a35461582 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1399,7 +1399,7 @@ parenthesis), or any expression in parentheses: > base->alist[idx](args) base->(getFuncRef())(args) Note that in the last call the base is passed to the function resulting from -"(getFuncRef())", inserted before "args". +"(getFuncRef())", inserted before "args". *E1275* *E274* "->name(" must not contain white space. There can be white space before the @@ -1559,7 +1559,7 @@ allowing the inclusion of Vim script expressions (see |expr1|). Any expression returning a value can be enclosed between curly braces. The value is converted to a string. All the text and results of the expressions are concatenated to make a new string. - *E1278* + *E1278* *E1279* To include an opening brace '{' or closing brace '}' in the string content double it. For double quoted strings using a backslash also works. A single closing brace '}' will result in an error. @@ -2682,7 +2682,7 @@ See |:verbose-cmd| for more information. Define a new function by the name {name}. The body of the function follows in the next lines, until the matching |:endfunction|. - + *E1267* The name must be made of alphanumeric characters and '_', and must start with a capital or "s:" (see above). Note that using "b:" or "g:" is not allowed. diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index d5e9915931..7700d26e10 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -928,7 +928,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): becomes invalid. Vim doesn't automatically update the matches. Similar to moving the cursor for "\%#" |/\%#|. - */\%l* */\%>l* */\%<l* *E951* *E1204* + */\%l* */\%>l* */\%<l* *E951* *E1204* *E1273* \%23l Matches in a specific line. \%<23l Matches above a specific line (lower line number). \%>23l Matches below a specific line (higher line number). diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index 6a2471acf2..d11557c799 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -591,7 +591,7 @@ POPUP_CREATE() ARGUMENTS *popup_create-arguments* The first argument of |popup_create()| (and the second argument to |popup_settext()|) specifies the text to be displayed, and optionally text -properties. It is in one of four forms: +properties. It is in one of four forms: *E1284* - a buffer number - a string - a list of strings diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index a7e0e7e414..f15d3b1cb7 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -103,7 +103,7 @@ zuW *zuG* *zuW* zuG Undo |zW| and |zG|, remove the word from the internal word list. Count used as with |zg|. - *:spe* *:spellgood* + *:spe* *:spellgood* *E1280* :[count]spe[llgood] {word} Add {word} as a good word to 'spellfile', like with |zg|. Without count the first name is used, with a diff --git a/runtime/doc/tags b/runtime/doc/tags index df1a64fb8d..5daad6aaf1 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4068,10 +4068,12 @@ E1079 vim9.txt /*E1079* E108 eval.txt /*E108* E1080 vim9.txt /*E1080* E1081 eval.txt /*E1081* +E1082 vim9.txt /*E1082* E1083 editing.txt /*E1083* E1084 eval.txt /*E1084* E1085 eval.txt /*E1085* E1087 vim9.txt /*E1087* +E1088 vim9.txt /*E1088* E1089 eval.txt /*E1089* E109 eval.txt /*E109* E1090 eval.txt /*E1090* @@ -4269,17 +4271,36 @@ E1263 eval.txt /*E1263* E1264 vim9.txt /*E1264* E1265 eval.txt /*E1265* E1266 if_pyth.txt /*E1266* +E1267 eval.txt /*E1267* +E1268 vim9.txt /*E1268* +E1269 vim9.txt /*E1269* E127 eval.txt /*E127* E1270 change.txt /*E1270* E1271 vim9.txt /*E1271* +E1272 vim9.txt /*E1272* +E1273 pattern.txt /*E1273* E1274 cmdline.txt /*E1274* +E1275 eval.txt /*E1275* E1276 builtin.txt /*E1276* +E1277 channel.txt /*E1277* E1278 eval.txt /*E1278* +E1279 eval.txt /*E1279* E128 eval.txt /*E128* +E1280 spell.txt /*E1280* E1281 pattern.txt /*E1281* E1282 eval.txt /*E1282* E1283 eval.txt /*E1283* +E1284 popup.txt /*E1284* +E1285 builtin.txt /*E1285* +E1286 builtin.txt /*E1286* +E1287 builtin.txt /*E1287* +E1288 builtin.txt /*E1288* +E1289 builtin.txt /*E1289* E129 eval.txt /*E129* +E1290 change.txt /*E1290* +E1291 testing.txt /*E1291* +E1292 cmdline.txt /*E1292* +E1293 textprop.txt /*E1293* E13 message.txt /*E13* E131 eval.txt /*E131* E132 eval.txt /*E132* @@ -10694,6 +10715,7 @@ vimscript-versions eval.txt /*vimscript-versions* vimtutor usr_01.txt /*vimtutor* virtcol() builtin.txt /*virtcol()* virtcol2col() builtin.txt /*virtcol2col()* +virtual-text textprop.txt /*virtual-text* visual-block visual.txt /*visual-block* visual-change visual.txt /*visual-change* visual-examples visual.txt /*visual-examples* diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt index 7e8e8b9cc0..f251781c43 100644 --- a/runtime/doc/testing.txt +++ b/runtime/doc/testing.txt @@ -186,6 +186,7 @@ test_gui_event({event}, {args}) keyup generate a keyup event keydown generate a keydown event keycode: Keycode to use for a keyup or a keydown event. + *E1291* "tabline": Inject a mouse click event on the tabline to select a diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt index 6b4c0235e8..d231082f07 100644 --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -171,7 +171,8 @@ prop_add({lnum}, {col}, {props}) the text. A negative "id" will be chosen and is returned. Once a property with "text" has been added for a buffer then using a - negative "id" for any other property will give an error. + negative "id" for any other property will give an error: + *E1293* Can also be used as a |method|: > GetLnum()->prop_add(col, props) diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 20dbce9547..7156df7427 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -39,18 +39,24 @@ browser use: https://github.com/vim/vim/issues/1234 -------------------- Known bugs and current work ----------------------- PR to consider: -- Fix CTRL-[ for Win32 on Belgian keyboard #10687 (closes #10454) - stricter parsing for has('patch-x.y.z') #10752 - cmdheight=0 #10675 Does it work properly? - add splitscroll #10682 Useful? Any trouble? Null Chilly says it's OK. suggestion: names instead of numbers for the option value + problem depending on whether window is focused or not -Support virtual text: -- clear b_textprop_text when buffer is cleared +Support virtual text: #7553 - Remove and free text when textprop is removed with negative ID. - "gj" does not work correctly +- no virtual text when 'signcolumn' is set to "yes" #10794 - placement at the end of the line: after the text (text_align: "end"), right - aligned (text_align: "right") + aligned (text_align: "right"); choice: truncate when not enough space or + wrap to next line (text_wrap: "yes"); Also: fill with space to text wraps to + start of next screen line (text_align: "below") + Also consider an empty line, should fix #10786. Also check inserting text. +- win_lbr_chartabsize() TODO item: count screen cells +- wrong cursor position (Yegappan, July 27) +- many tests Further Vim9 improvements, possibly after launch: - Use Vim9 for more runtime files. @@ -238,6 +244,9 @@ entry separately. #6609 Multiplexers (screen, tmux) can request it to the underlying terminal, and pass it on with modifications. +Using "A" and "o" in manually created fold (in empty buffer) does not behave +consistenly (James McCoy, #10698) + When scheme can't be found by configure there is no clear "not found" message: configure:5769: checking MzScheme install prefix configure:5781: result: diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index 4b54f18f9f..ce1b182d94 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -281,7 +281,7 @@ start with an upper case letter even when using the "s:" prefix. In legacy script "s:funcref" could be used, because it could not be referred to with "funcref". In Vim9 script it can, therefore "s:Funcref" must be used to avoid that the name interferes with builtin functions. - *vim9-s-namespace* + *vim9-s-namespace* *E1268* The use of the "s:" prefix is not supported at the Vim9 script level. All functions and variables without a prefix are script-local. @@ -857,6 +857,8 @@ No curly braces expansion ~ Command modifiers are not ignored ~ *E1176* Using a command modifier for a command that does not use it gives an error. + *E1082* +Also, using a command modifier without a following command is now an error. Dictionary literals ~ @@ -1234,6 +1236,9 @@ variables can be accessed without the "s:" prefix. They must be defined before the function is compiled. If the script the function is defined in is legacy script, then script-local variables must be accessed with the "s:" prefix if they do not exist at the time of compiling. + *E1269* +Script-local variables in a |Vim9| script must be declared at the script +level. They cannot be created in a function, also not in a legacy function. *:defc* *:defcompile* :defc[ompile] Compile functions defined in the current script that @@ -1492,6 +1497,8 @@ value is not actually changed. If you need to change the type, e.g. to change it to a string, use the |string()| function. Or use |str2nr()| to convert a string to a number. +If a type is given where it is not expected you can get *E1272* . + Type inference ~ *type-inference* @@ -1696,8 +1703,8 @@ be exported. {not implemented yet: class, interface} Import ~ - *:import* *:imp* *E1094* *E1047* *E1262* - *E1048* *E1049* *E1053* *E1071* *E1236* + *:import* *:imp* *E1094* *E1047* *E1262* + *E1048* *E1049* *E1053* *E1071* *E1088* *E1236* The exported items can be imported in another script. The import syntax has two forms. The simple form: > import {filename} diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim index a78f7811f1..cf8dd17c44 100644 --- a/runtime/ftplugin/debchangelog.vim +++ b/runtime/ftplugin/debchangelog.vim @@ -1,9 +1,9 @@ " Vim filetype plugin file (GUI menu, folding and completion) " Language: Debian Changelog -" Maintainer: Debian Vim Maintainers +" Maintainer: Debian Vim Maintainers <team+vim@tracker.debian.org> " Former Maintainers: Michael Piefel <piefel@informatik.hu-berlin.de> " Stefano Zacchiroli <zack@debian.org> -" Last Change: 2018-01-28 +" Last Change: 2022 Jul 25 " License: Vim License " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim @@ -35,6 +35,11 @@ if exists('g:did_changelog_ftplugin') finish endif +" Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise +" <CR> would not be recognized. See ":help 'cpoptions'". +let s:cpo_save = &cpo +set cpo&vim + " Don't load another plugin (this is global) let g:did_changelog_ftplugin = 1 @@ -101,13 +106,13 @@ endfunction " These functions implement the menus function NewVersion() " The new entry is unfinalised and shall be changed - amenu disable Changelog.New\ Version - amenu enable Changelog.Add\ Entry - amenu enable Changelog.Close\ Bug - amenu enable Changelog.Set\ Distribution - amenu enable Changelog.Set\ Urgency - amenu disable Changelog.Unfinalise - amenu enable Changelog.Finalise + amenu disable &Changelog.&New\ Version + amenu enable &Changelog.&Add\ Entry + amenu enable &Changelog.&Close\ Bug + amenu enable &Changelog.Set\ &Distribution + amenu enable &Changelog.Set\ &Urgency + amenu disable &Changelog.U&nfinalise + amenu enable &Changelog.&Finalise call append(0, substitute(getline(1), '-\([[:digit:]]\+\))', '-$$\1)', '')) call append(1, '') call append(2, '') @@ -117,7 +122,9 @@ function NewVersion() normal! 1G0 call search(')') normal! h - normal! + " ':normal' doens't support key annotation (<c-a>) directly. + " Vim's manual recommends using ':exe' to use key annotation indirectly (backslash-escaping needed though). + exe "normal! \<c-a>" call setline(1, substitute(getline(1), '-\$\$', '-', '')) if exists('g:debchangelog_fold_enable') foldopen @@ -161,13 +168,13 @@ endfunction function <SID>UnfinaliseMenu() " This means the entry shall be changed - amenu disable Changelog.New\ Version - amenu enable Changelog.Add\ Entry - amenu enable Changelog.Close\ Bug - amenu enable Changelog.Set\ Distribution - amenu enable Changelog.Set\ Urgency - amenu disable Changelog.Unfinalise - amenu enable Changelog.Finalise + amenu disable &Changelog.&New\ Version + amenu enable &Changelog.&Add\ Entry + amenu enable &Changelog.&Close\ Bug + amenu enable &Changelog.Set\ &Distribution + amenu enable &Changelog.Set\ &Urgency + amenu disable &Changelog.U&nfinalise + amenu enable &Changelog.&Finalise endfunction function Unfinalise() @@ -179,13 +186,13 @@ endfunction function <SID>FinaliseMenu() " This means the entry should not be changed anymore - amenu enable Changelog.New\ Version - amenu disable Changelog.Add\ Entry - amenu disable Changelog.Close\ Bug - amenu disable Changelog.Set\ Distribution - amenu disable Changelog.Set\ Urgency - amenu enable Changelog.Unfinalise - amenu disable Changelog.Finalise + amenu enable &Changelog.&New\ Version + amenu disable &Changelog.&Add\ Entry + amenu disable &Changelog.&Close\ Bug + amenu disable &Changelog.Set\ &Distribution + amenu disable &Changelog.Set\ &Urgency + amenu enable &Changelog.U&nfinalise + amenu disable &Changelog.&Finalise endfunction function Finalise() @@ -198,26 +205,26 @@ endfunction function <SID>MakeMenu() amenu &Changelog.&New\ Version :call NewVersion()<CR> - amenu Changelog.&Add\ Entry :call AddEntry()<CR> - amenu Changelog.&Close\ Bug :call CloseBug()<CR> - menu Changelog.-sep- <nul> - - amenu Changelog.Set\ &Distribution.&unstable :call Distribution("unstable")<CR> - amenu Changelog.Set\ Distribution.&frozen :call Distribution("frozen")<CR> - amenu Changelog.Set\ Distribution.&stable :call Distribution("stable")<CR> - menu Changelog.Set\ Distribution.-sep- <nul> - amenu Changelog.Set\ Distribution.frozen\ unstable :call Distribution("frozen unstable")<CR> - amenu Changelog.Set\ Distribution.stable\ unstable :call Distribution("stable unstable")<CR> - amenu Changelog.Set\ Distribution.stable\ frozen :call Distribution("stable frozen")<CR> - amenu Changelog.Set\ Distribution.stable\ frozen\ unstable :call Distribution("stable frozen unstable")<CR> - - amenu Changelog.Set\ &Urgency.&low :call Urgency("low")<CR> - amenu Changelog.Set\ Urgency.&medium :call Urgency("medium")<CR> - amenu Changelog.Set\ Urgency.&high :call Urgency("high")<CR> - - menu Changelog.-sep- <nul> - amenu Changelog.U&nfinalise :call Unfinalise()<CR> - amenu Changelog.&Finalise :call Finalise()<CR> + amenu &Changelog.&Add\ Entry :call AddEntry()<CR> + amenu &Changelog.&Close\ Bug :call CloseBug()<CR> + menu &Changelog.-sep- <nul> + + amenu &Changelog.Set\ &Distribution.&unstable :call Distribution("unstable")<CR> + amenu &Changelog.Set\ &Distribution.&frozen :call Distribution("frozen")<CR> + amenu &Changelog.Set\ &Distribution.&stable :call Distribution("stable")<CR> + menu &Changelog.Set\ &Distribution.-sep- <nul> + amenu &Changelog.Set\ &Distribution.frozen\ unstable :call Distribution("frozen unstable")<CR> + amenu &Changelog.Set\ &Distribution.stable\ unstable :call Distribution("stable unstable")<CR> + amenu &Changelog.Set\ &Distribution.stable\ frozen :call Distribution("stable frozen")<CR> + amenu &Changelog.Set\ &Distribution.stable\ frozen\ unstable :call Distribution("stable frozen unstable")<CR> + + amenu &Changelog.Set\ &Urgency.&low :call Urgency("low")<CR> + amenu &Changelog.Set\ &Urgency.&medium :call Urgency("medium")<CR> + amenu &Changelog.Set\ &Urgency.&high :call Urgency("high")<CR> + + menu &Changelog.-sep- <nul> + amenu &Changelog.U&nfinalise :call Unfinalise()<CR> + amenu &Changelog.&Finalise :call Finalise()<CR> if <SID>Finalised() call <SID>FinaliseMenu() @@ -228,7 +235,7 @@ endfunction augroup changelogMenu au BufEnter * if &filetype == "debchangelog" | call <SID>MakeMenu() | endif -au BufLeave * if &filetype == "debchangelog" | silent! aunmenu Changelog | endif +au BufLeave * if &filetype == "debchangelog" | silent! aunmenu &Changelog | endif augroup END " }}} @@ -380,4 +387,8 @@ setlocal omnifunc=DebCompleteBugs " }}} +" Restore the previous value of 'cpoptions'. +let &cpo = s:cpo_save +unlet s:cpo_save + " vim: set foldmethod=marker: diff --git a/runtime/ftplugin/desktop.vim b/runtime/ftplugin/desktop.vim new file mode 100644 index 0000000000..bd6fd7097c --- /dev/null +++ b/runtime/ftplugin/desktop.vim @@ -0,0 +1,13 @@ +" Vim filetype plugin file +" Language: XDG desktop entry +" Maintainer: Eisuke Kawashima ( e.kawaschima+vim AT gmail.com ) +" Last Change: 2022-07-26 + +if exists('b:did_ftplugin') + finish +endif +let b:did_ftplugin = v:true + +setl comments=:# +setl commentstring=#%s +let b:undo_ftplugin = 'setl com< cms<' diff --git a/runtime/ftplugin/swayconfig.vim b/runtime/ftplugin/swayconfig.vim new file mode 100644 index 0000000000..45d6bdb3e5 --- /dev/null +++ b/runtime/ftplugin/swayconfig.vim @@ -0,0 +1,16 @@ +" Vim filetype plugin file +" Language: sway config file +" Original Author: James Eapen <james.eapen@vai.org> +" Maintainer: James Eapen <james.eapen@vai.org> +" Version: 0.1 +" Last Change: 2022 June 07 + +if exists("b:did_ftplugin") + finish +endif + +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setlocal cms<" + +setlocal commentstring=#\ %s diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index a3c32d6342..65e0ffc40c 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -600,7 +600,7 @@ func s:Alien3() endif if b:hi_indent.scripttype == "javascript" " indent for further lines - return eval(b:hi_js1indent) + GetJavascriptIndent() + return GetJavascriptIndent() else return -1 endif diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim index f3bf96aa97..8077442ed0 100644 --- a/runtime/indent/javascript.vim +++ b/runtime/indent/javascript.vim @@ -473,6 +473,12 @@ function GetJavascriptIndent() elseif num return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op) endif + + let nest = get(get(b:, 'hi_indent', {}), 'blocklnr') + if nest + return indent(nextnonblank(nest + 1)) + b_l + is_op + endif + return b_l + is_op endfunction diff --git a/runtime/lang/Makefile b/runtime/lang/Makefile index 4a122cb2a1..901c4eb0cc 100644 --- a/runtime/lang/Makefile +++ b/runtime/lang/Makefile @@ -22,6 +22,9 @@ all: \ menu_sr_rs.iso_8859-2.vim \ menu_sr_rs.ascii.vim \ menu_czech_czech_republic.ascii.vim \ + menu_hu_hu.iso_8859-2.vim \ + menu_sk_sk.iso_8859-2.vim \ + # Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim. menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim @@ -39,7 +42,7 @@ menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim rm -f menu_cs_cz.iso_8859-2.vim iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \ - sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' \ + sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' \ -e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \ -e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/' \ > menu_cs_cz.iso_8859-2.vim @@ -95,7 +98,7 @@ menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim rm -f menu_pl_pl.iso_8859-2.vim iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \ - sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim + sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim # Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim. menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim @@ -194,3 +197,15 @@ menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim rm -f menu_uk_ua.koi8-u.vim iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \ sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim + +# Convert menu_hu_hu.utf-8.vim to create menu_hu_hu.iso_8859-2.vim. +menu_hu_hu.iso_8859-2.vim: menu_hu_hu.utf-8.vim + rm -f menu_hu_hu.iso_8859-2.vim + iconv -f utf-8 -t iso8859-2 menu_hu_hu.utf-8.vim | \ + sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_hu_hu.utf-8.vim, DO NOT EDIT/' > menu_hu_hu.iso_8859-2.vim + +# Convert menu_slovak_slovak_republic.1250.vim to create menu_sk_sk.iso_8859-2.vim. +menu_sk_sk.iso_8859-2.vim: menu_slovak_slovak_republic.1250.vim + rm -f menu_sk_sk.iso_8859-2.vim + iconv -f cp1250 -t iso8859-2 menu_slovak_slovak_republic.1250.vim | \ + sed -e 's/scriptencoding cp1250/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_slovak_slovak_republic.1250.vim, DO NOT EDIT/' > menu_sk_sk.iso_8859-2.vim diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim index a58ec9c590..915cd80da1 100644 --- a/runtime/lang/menu_chinese_gb.936.vim +++ b/runtime/lang/menu_chinese_gb.936.vim @@ -1,10 +1,15 @@ " Menu Translations: Simplified Chinese -" Maintainer: Shun Bai <baishunde@gmail.com> -" Previous Maintainer: Yuheng Xie <elephant@linux.net.cn> -" Last Change: 2022 Feb 19 +" Maintainer: Ada (Haowen) Yu <me@yuhaowen.com> +" Previous Maintainer: Shun Bai <baishunde@gmail.com>, Yuheng Xie <elephant@linux.net.cn> +" Last Change: 2022 July 9 " Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT +" +" Generated with the scripts from: +" +" https://github.com/adaext/vim-menutrans-helper " Quit when menu translations have already been done. + if exists("did_menu_trans") finish endif @@ -15,18 +20,18 @@ set cpo&vim scriptencoding cp936 " Help menu -menutrans &Help 帮助(&H) +menutrans &Help 帮助(&H) " Help menuitems and dialog {{{1 -menutrans &Overview<Tab><F1> 概述(&O)<Tab><F1> -menutrans &User\ Manual 用户手册(&U) -menutrans &How-to\ Links 如何使用(&H) -menutrans &Find\.\.\. 查找(&F)\.\.\. -menutrans &Credits 致谢(&C) -menutrans Co&pying 版权(&P) -menutrans &Sponsor/Register 赞助/注册(&S) -menutrans O&rphans 拯救孤儿(&R) -menutrans &Version 版本(&V) -menutrans &a |