diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 14:23:09 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 22:29:02 -0400 |
| commit | 330500a5bfb1207e0c9eb79ac27fb8244da93ce0 (patch) | |
| tree | bf830508b9063636dbbb064175ade5f2b7996bf9 | |
| parent | b16c7c515c34d2f695a595527594325abc6a640b (diff) | |
| download | rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.gz rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.bz2 rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.zip | |
vim-patch:cb80aa2d53e5
Update runtime files.
https://github.com/vim/vim/commit/cb80aa2d53e56d3aba3b3c439fb467f29a750c5e
Omit runtime/doc/tabpage.txt.
Patch v8.2.1401 is not ported yet.
Port optwin.vim changes without gettext().
Patch v8.2.1544 is not ported yet.
43 files changed, 124 insertions, 98 deletions
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index d6bde99a7d..f6b876df05 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,7 +1,7 @@ " zip.vim: Handles browsing zipfiles " AUTOLOAD PORTION " Date: Jan 07, 2020 -" Version: 30 +" Version: 31 " Maintainer: Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1 @@ -20,7 +20,7 @@ if &cp || exists("g:loaded_zip") finish endif -let g:loaded_zip= "v30" +let g:loaded_zip= "v31" if v:version < 702 echohl WarningMsg echo "***warning*** this version of zip needs vim 7.2 or later" @@ -65,7 +65,7 @@ endif " zip#Browse: {{{2 fun! zip#Browse(zipfile) " call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") - " sanity check: ensure that the zipfile has "PK" as its first two letters + " sanity check: insure that the zipfile has "PK" as its first two letters " (zipped files have a leading PK as a "magic cookie") if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 6619449d91..ab2c411ee2 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -709,7 +709,7 @@ InsertEnter Just before starting Insert mode. Also for string. *InsertLeavePre* InsertLeavePre Just before leaving Insert mode. Also when - using CTRL-O |i_CTRL-O|. Be caseful not to + using CTRL-O |i_CTRL-O|. Be careful not to change mode or use `:normal`, it will likely cause trouble. *InsertLeave* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 10e1501927..15a9fcdde4 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -63,10 +63,14 @@ g CTRL-G Prints the current position of the cursor in five ways: Column, Line, Word, Character and Byte. If the number of Characters and Bytes is the same then the Character position is omitted. + If there are characters in the line that take more than one position on the screen (<Tab> or special - character), both the "real" column and the screen - column are shown, separated with a dash. + character), or characters using more than one byte per + column (characters above 0x7F when 'encoding' is + utf-8), both the byte column and the screen column are + shown, separated by a dash. + Also see the 'ruler' option and the |wordcount()| function. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index fafe701d18..2c9140ef0a 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -9306,7 +9306,8 @@ winsaveview() Returns a |Dictionary| that contains information to restore curswant column for vertical movement topline first line in the window topfill filler lines, only in diff mode - leftcol first column displayed + leftcol first column displayed; only used when + 'wrap' is off skipcol columns skipped Note that no option values are saved. @@ -9796,8 +9797,9 @@ be used to pass settings to the autoload script before it's loaded: > Note that when you make a mistake and call a function that is supposed to be defined in an autoload script, but the script doesn't actually define the -function, the script will be sourced every time you try to call the function. -And you will get an error message every time. +function, you will get an error message for the missing function. If you fix +the autoload script it won't be automatically loaded again. Either restart +Vim or manually source the script. Also note that if you have two script files, and one calls a function in the other and vice versa, before the used function is defined, it won't work. diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 63bdfd2581..c8a4168ab2 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -292,6 +292,7 @@ If you enter a value of 10, it will end up in the file as a 0. The 10 is a the buffer to a file, the <NL> character is translated into <Nul>. The <NL> character is written at the end of each line. Thus if you want to insert a <NL> character in a file you will have to make a line break. +Also see 'fileformat'. *i_CTRL-X* *insert_expand* CTRL-X enters a sub-mode where several commands can be used. Most of these diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 763ff02db1..6b99128272 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -182,11 +182,14 @@ l or *l* *^* ^ To the first non-blank character of the line. - |exclusive| motion. + |exclusive| motion. Any count is ignored. *$* *<End>* *<kEnd>* $ or <End> To the end of the line. When a count is given also go - [count - 1] lines downward. |inclusive| motion. + [count - 1] lines downward, or as far is possible. + |inclusive| motion. If a count of 2 of larger is + given and the cursor is on the last line, that is an + error an the cursor doesn't move. In Visual mode the cursor goes to just after the last character in the line. When 'virtualedit' is active, "$" may move the cursor diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index 18d055315d..c715644847 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -154,4 +154,4 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell *zip-copyright* v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing ============================================================================== -vim:tw=78:ts=8:noet:ft=help:fdm=marker +vim:tw=78:ts=8:ft=help:noet:norl:fdm=marker diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 0fc164965a..160b6cecfd 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -371,7 +371,7 @@ back the text of three deletes ago with '"3P'. *redo-register* If you want to get back more than one part of deleted text, you can use a special feature of the repeat command ".". It will increase the number of the -register used. So if you first do ""1P", the following "." will result in a +register used. So if you first do '"1P', the following "." will result in a '"2P'. Repeating this will result in all numbered registers being inserted. Example: If you deleted text with 'dd....' it can be restored with diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index d7d22c4227..361fe51caa 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -293,7 +293,7 @@ machines. Therefore, don't rely on Vim always warning you. If you really don't want to see this message, you can add the 'A' flag to the 'shortmess' option. But it's very unusual that you need this. -For programatic access to the swap file, see |swapinfo()|. +For programmatic access to the swap file, see |swapinfo()|. ============================================================================== *11.4* Further reading diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ba87ac165a..8722503c59 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1560,7 +1560,8 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec au BufNewFile,BufRead catalog setf catalog " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc. -" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts +" Gentoo ebuilds, Arch Linux PKGBUILDs and Alpine Linux APKBUILDs are actually +" bash scripts. " NOTE: Patterns ending in a star are further down, these have lower priority. au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.ebuild,*.bash,*.eclass,PKGBUILD,APKBUILD call dist#ft#SetFileTypeSH("bash") au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh") diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim index 2bbc345b43..ece11d7249 100644 --- a/runtime/ftplugin/erlang.vim +++ b/runtime/ftplugin/erlang.vim @@ -1,7 +1,7 @@ " Vim ftplugin file " Language: Erlang -" Author: Oscar Hellstrm <oscar@oscarh.net> -" Contributors: Ricardo Catalinas Jimnez <jimenezrick@gmail.com> +" Author: Oscar Hellström <oscar@oscarh.net> +" Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> " Eduardo Lopez (http://github.com/tapichu) " License: Vim license " Version: 2012/01/25 diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim index bfa8703082..168bc38eb3 100644 --- a/runtime/ftplugin/make.vim +++ b/runtime/ftplugin/make.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Make " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Apr 02 +" Last Change: 2020 Oct 16 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -9,10 +9,10 @@ if exists("b:did_ftplugin") endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl et< sts< fo< com< cms< inc<" +let b:undo_ftplugin = "setl et< sts< sw< fo< com< cms< inc<" " Make sure a hard tab is used, required for most make programs -setlocal noexpandtab softtabstop=0 +setlocal noexpandtab softtabstop=0 shiftwidth=0 " Set 'formatoptions' to break comment lines but not other lines, " and insert the comment leader when hitting <CR> or using "o". diff --git a/runtime/ftplugin/rpl.vim b/runtime/ftplugin/rpl.vim index 909e141cc6..8b4d5b0d48 100644 --- a/runtime/ftplugin/rpl.vim +++ b/runtime/ftplugin/rpl.vim @@ -1,6 +1,6 @@ " Vim filetype plugin file " Language: RPL/2 -" Maintainer: Jol BERTRAND <rpl2@free.fr> +" Maintainer: Joël BERTRAND <rpl2@free.fr> " Last Change: 2012 Mar 07 " Version: 0.1 diff --git a/runtime/indent/rpl.vim b/runtime/indent/rpl.vim index fab258ed2b..8577c4d274 100644 --- a/runtime/indent/rpl.vim +++ b/runtime/indent/rpl.vim @@ -2,7 +2,7 @@ " Language: RPL/2 " Version: 0.2 " Last Change: 2017 Jun 13 -" Maintainer: BERTRAND Jol <rpl2@free.fr> +" Maintainer: BERTRAND Joël <rpl2@free.fr> " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/runtime/indent/tilde.vim b/runtime/indent/tilde.vim index 13082c8692..e722a0994c 100644 --- a/runtime/indent/tilde.vim +++ b/runtime/indent/tilde.vim @@ -1,5 +1,5 @@ "Description: Indent scheme for the tilde weblanguage -"Author: Tobias Rundstrm <tobi@tobi.nu> +"Author: Tobias Rundström <tobi@tobi.nu> "URL: http://tilde.tildesoftware.net "Last Change: May 8 09:15:09 CEST 2002 diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 3472ad6e28..9644223ba1 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2020 Jun 10 +" Last Change: 2020 Oct 23 " If there already is an option window, jump to that one. let buf = bufnr('option-window') @@ -69,6 +69,10 @@ fun! <SID>Space() endif endfun +let s:local_to_window = '(local to window)' +let s:local_to_buffer = '(local to buffer)' +let s:global_or_local = '(global or local to buffer)' + " find the window in which the option applies " returns 0 for global option, 1 for local option, -1 for error fun! <SID>Find(lnum) @@ -155,6 +159,16 @@ call append(6, '" Hit <Space> on a "set" line to refresh it.') " These functions are called often below. Keep them fast! +" Add an option name and explanation. The text can contain "\n" characters +" where a line break is to be inserted. +func <SID>AddOption(name, text) + let lines = split(a:text, "\n") + call append("$", a:name .. "\t" .. lines[0]) + for line in lines[1:] + call append("$", "\t" .. line) + endfor +endfunc + " Init a local binary option fun! <SID>BinOptionL(name) let val = getwinvar(winnr('#'), '&' . a:name) @@ -725,19 +739,19 @@ call <SID>OptionG("udir", &udir) call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", " \tset ur=" . &ur) call append("$", "modified\tchanges have been made and not written to a file") -call append("$", "\t(local to buffer)") +call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("mod") call append("$", "readonly\tbuffer is not to be written") -call append("$", "\t(local to buffer)") +call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ro") -call append("$", "modifiable\tchanges to the text are not possible") -call append("$", "\t(local to buffer)") +call <SID>AddOption("modifiable", "changes to the text are possible") +call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ma") call append("$", "textwidth\tline length above which to break a line") -call append("$", "\t(local to buffer)") +call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("tw") call append("$", "wrapmargin\tmargin from the right in which to break a line") -call append("$", "\t(local to buffer)") +call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("wm") call append("$", "backspace\tspecifies what <BS>, CTRL-W, etc. can do in Insert mode") call append("$", " \tset bs=" . &bs) @@ -789,20 +803,19 @@ if has("digraphs") endif call append("$", "tildeop\tthe \"~\" command behaves like an operator") call <SID>BinOptionG("top", &top) -call append("$", "operatorfunc\tfunction called for the\"g@\" operator") +call <SID>AddOption("operatorfunc", "function called for the \"g@\" operator") call <SID>OptionG("opfunc", &opfunc) call append("$", "showmatch\twhen inserting a bracket, briefly jump to its match") call <SID>BinOptionG("sm", &sm) call append("$", "matchtime\ttenth of a second to show a match for 'showmatch'") call append("$", " \tset mat=" . &mat) call append("$", "matchpairs\tlist of pairs that match for the \"%\" command") -call append("$", "\t(local to buffer)") +call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("mps") call append("$", "joinspaces\tuse two spaces after '.' when joining a line") call <SID>BinOptionG("js", &js) -call append("$", "nrformats\t\"alpha\", \"octal\" and/or \"hex\"; number formats recognized for") -call append("$", "\tCTRL-A and CTRL-X commands") -call append("$", "\t(local to buffer)") +call <SID>AddOption("nrformats", "\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\nrecognized for CTRL-A and CTRL-X commands") +call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("nf") @@ -876,11 +889,11 @@ endif if has("folding") call <SID>Header("folding") - call append("$", "foldenable\tset to display all folds open") - call append("$", "\t(local to window)") + call <SID>AddOption("foldenable", "unset to display all folds open") + call append("$", "\t" .. s:local_to_window) call <SID>BinOptionL("fen") call append("$", "foldlevel\tfolds with a level higher than this number will be closed") - call append("$", "\t(local to window)") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdl") call append("$", "foldlevelstart\tvalue for 'foldlevel' when starting to edit a file") call append("$", " \tset fdls=" . &fdls) @@ -899,20 +912,20 @@ if has("folding") call <SID>OptionL("fml") call append("$", "commentstring\ttemplate for comments; used to put the marker in") call <SID>OptionL("cms") - call append("$", "foldmethod\tfolding type: \"manual\", \"indent\", \"expr\", \"marker\" or \"syntax\"") - call append("$", "\t(local to window)") + call <SID>AddOption("foldmethod", "folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n\"syntax\" or \"diff\"") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdm") call append("$", "foldexpr\texpression used when 'foldmethod' is \"expr\"") - call append("$", "\t(local to window)") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fde") call append("$", "foldignore\tused to ignore lines when 'foldmethod' is \"indent\"") - call append("$", "\t(local to window)") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdi") call append("$", "foldmarker\tmarkers used when 'foldmethod' is \"marker\"") - call append("$", "\t(local to window)") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fmr") call append("$", "foldnestmax\tmaximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\"") - call append("$", "\t(local to window)") + call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdn") endif @@ -1017,7 +1030,7 @@ call append("$", " \tset ut=" . &ut) call <SID>Header("command line editing") -call append("$", "history\thow many command lines are remembered ") +call <SID>AddOption("history", "how many command lines are remembered") call append("$", " \tset hi=" . &hi) call append("$", "wildchar\tkey that triggers command-line expansion") call append("$", " \tset wc=" . &wc) @@ -1105,12 +1118,12 @@ if has("quickfix") endif -if has("msdos") || has("win16") || has("win32") +if has("win32") call <SID>Header("system specific") - if has("msdos") || has("win16") || has("win32") - call append("$", "shellslash\tuse forward slashes in file names; for Unix-like shells") - call <SID>BinOptionG("ssl", &ssl) - endif + call <SID>AddOption("shellslash", "use forward slashes in file names; for Unix-like shells") + call <SID>BinOptionG("ssl", &ssl) + call <SID>AddOption("completeslash", "specifies slash/backslash used for completion") + call <SID>OptionG("csl", &csl) endif @@ -1214,7 +1227,7 @@ endif call <SID>Header("various") -call append("$", "virtualedit\twhen to use virtual editing: \"block\", \"insert\" and/or \"all\"") +call <SID>AddOption("virtualedit", "when to use virtual editing: \"block\", \"insert\", \"all\"\nand/or \"onemore\"") call <SID>OptionG("ve", &ve) call append("$", "eventignore\tlist of autocommand events which are to be ignored") call <SID>OptionG("ei", &ei) @@ -1248,10 +1261,10 @@ if has("shada") endif if has("quickfix") call append("$", "bufhidden\twhat happens with a buffer when it's no longer in a window") - call append("$", "\t(local to buffer)") + call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bh") - call append("$", "buftype\t\"\", \"nofile\", \"nowrite\" or \"quickfix\": type of buffer") - call append("$", "\t(local to buffer)") + call <SID>AddOption("buftype", "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer") + call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bt") endif call append("$", "buflisted\twhether the buffer shows up in the buffer list") diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index 82f6cc1884..036d17818a 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: 2020 Jul 12 +" Last Change: 2020 Oct 25 " " WORK IN PROGRESS - Only the basics work " Note: On MS-Windows you need a recent version of gdb. The one included with @@ -131,7 +131,11 @@ func s:StartDebug_internal(dict) " call ch_logfile('debuglog', 'w') let s:sourcewin = win_getid(winnr()) - let s:startsigncolumn = &signcolumn + + " Remember the old value of 'signcolumn' for each buffer that it's set in, so + " that we can restore the value for all buffers. + let b:save_signcolumn = &signcolumn + let s:signcolumn_buflist = [bufnr()] let s:save_columns = 0 let s:allleft = 0 @@ -603,8 +607,20 @@ func s:EndDebugCommon() exe 'bwipe! ' . s:ptybuf endif + " Restore 'signcolumn' in all buffers for which it was set. call win_gotoid(s:sourcewin) - let &signcolumn = s:startsigncolumn + let was_buf = bufnr() + for bufnr in s:signcolumn_buflist + if bufexists(bufnr) + exe bufnr .. "buf" + if exists('b:save_signcolumn') + let &signcolumn = b:save_signcolumn + unlet b:save_signcolumn + endif + endif + endfor + exe was_buf .. "buf" + call s:DeleteCommands() call win_gotoid(curwinid) @@ -1174,6 +1190,10 @@ func s:HandleCursor(msg) exe lnum exe 'sign unplace ' . s:pc_id exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC file=' . fname + if !exists('b:save_signcolumn') + let b:save_signcolumn = &signcolumn + call add(s:signcolumn_buflist, bufnr()) + endif setlocal signcolumn=yes endif elseif !s:stopped || fname != '' diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim index 4b90d3e43f..b9e334fb98 100644 --- a/runtime/plugin/zipPlugin.vim +++ b/runtime/plugin/zipPlugin.vim @@ -20,14 +20,14 @@ if &cp || exists("g:loaded_zipPlugin") finish endif -let g:loaded_zipPlugin = "v30" +let g:loaded_zipPlugin = "v31" let s:keepcpo = &cpo set cpo&vim " --------------------------------------------------------------------- " Options: {{{1 if !exists("g:zipPlugin_ext") - let g:zipPlugin_ext='*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip' + let g:zipPlugin_ext='*.aar,*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip' endif " --------------------------------------------------------------------- diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim index e695dbc79a..c8e5a61bd1 100644 --- a/runtime/syntax/elf.vim +++ b/runtime/syntax/elf.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: ELF -" Maintainer: Christian V. J. Brssow <cvjb@cvjb.de> +" Maintainer: Christian V. J. Brüssow <cvjb@cvjb.de> " Last Change: Son 22 Jun 2003 20:43:14 CEST " Filenames: *.ab,*.am " URL: http://www.cvjb.de/comp/vim/elf.vim diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim index a1912461e6..9b39a7fd7d 100644 --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: FORTH " Current Maintainer: Johan Kotlinski <kotlinski@gmail.com> -" Previous Maintainer: Christian V. J. Brssow <cvjb@cvjb.de> +" Previous Maintainer: Christian V. J. Brüssow <cvjb@cvjb.de> " Last Change: 2018-03-29 " Filenames: *.fs,*.ft " URL: https://github.com/jkotlinski/forth.vim diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim index 7ff80c11a8..8ebd120226 100644 --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -8,10 +8,10 @@ " older Fortran 77 syntax file by Mario Eusebio and Preben Guldberg. " Since then, useful suggestions and contributions have been made, in order, by: " Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, -" Walter Dieudonn, Alexander Wagner, Roman Bertle, Charles Rendleman, +" Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman, " Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann, -" Stefano Zaghi, Vishnu V. Krishnan, Judical Grasset, Takuma Yoshida, -" Eisuke Kawashima, and Andr Chalella.` +" Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, Takuma Yoshida, +" Eisuke Kawashima, and André Chalella.` if exists("b:current_syntax") finish diff --git a/runtime/syntax/groff.vim b/runtime/syntax/groff.vim index d4dc0cc4f7..2cc7ccf704 100644 --- a/runtime/syntax/groff.vim +++ b/runtime/syntax/groff.vim @@ -1,6 +1,6 @@ " VIM syntax file " Language: groff -" Maintainer: Alejandro Lpez-Valencia <dradul@yahoo.com> +" Maintainer: Alejandro López-Valencia <dradul@yahoo.com> " URL: http://dradul.tripod.com/vim " Last Change: 2003-05-08-12:41:13 GMT-5. diff --git a/runtime/syntax/initng.vim b/runtime/syntax/initng.vim index 1a912c1d05..5d7685cde1 100644 --- a/runtime/syntax/initng.vim +++ b/runtime/syntax/initng.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: initng .i files -" Maintainer: Elan Ruusame <glen@pld-linux.org> +" Maintainer: Elan Ruusamäe <glen@pld-linux.org> " URL: http://glen.alkohol.ee/pld/initng/ " License: GPL v2 " Version: 0.13 diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim index bd28c732b1..e41de5db5a 100644 --- a/runtime/syntax/iss.vim +++ b/runtime/syntax/iss.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Inno Setup File (iss file) and My InnoSetup extension " Maintainer: Jason Mills (jmills@cs.mun.ca) -" Previous Maintainer: Dominique Stphan (dominique@mggen.com) +" Previous Maintainer: Dominique Stéphan (dominique@mggen.com) " Last Change: 2019 Sep 27 " " Todo: diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim index 30c87fce51..b26a7bcc46 100644 --- a/runtime/syntax/lout.vim +++ b/runtime/syntax/lout.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: Lout -" Maintainer: Christian V. J. Brssow <cvjb@cvjb.de> +" Maintainer: Christian V. J. Brüssow <cvjb@cvjb.de> " Last Change: So 12 Feb 2012 15:15:03 CET " Filenames: *.lout,*.lt " URL: http://www.cvjb.de/comp/vim/lout.vim diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim index 39e209336e..0590767f2d 100644 --- a/runtime/syntax/mmix.vim +++ b/runtime/syntax/mmix.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: MMIX -" Maintainer: Dirk Hsken, <huesken@informatik.uni-tuebingen.de> +" Maintainer: Dirk Hüsken, <huesken@informatik.uni-tuebingen.de> " Last Change: 2012 Jun 01 " (Dominique Pelle added @Spell) " Filenames: *.mms diff --git a/runtime/syntax/moo.vim b/runtime/syntax/moo.vim index 617058f8e3..6f2dd59e84 100644 --- a/runtime/syntax/moo.vim +++ b/runtime/syntax/moo.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: MOO " Maintainer: Timo Frenay <timo@frenay.net> -" Last Change: 2001 Oct 06 +" Last Change: 2020 Oct 19 " Note: Requires Vim 6.0 or above " quit when a syntax file was already loaded @@ -95,7 +95,7 @@ if exists("moo_unknown_builtin_functions") syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained endif -"Enclosed expressions +" Enclosed expressions syn match mooUnenclosedError display ~[')\]|}]~ syn match mooParenthesesError display ~[';\]|}]~ contained syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim index 3a8cf95856..04532e04bf 100644 --- a/runtime/syntax/nroff.vim +++ b/runtime/syntax/nroff.vim @@ -1,6 +1,6 @@ " VIM syntax file " Language: nroff/groff -" Maintainer: Pedro Alejandro Lpez-Valencia <palopezv@gmail.com> +" Maintainer: Pedro Alejandro López-Valencia <palopezv@gmail.com> " URL: http://vorbote.wordpress.com/ " Last Change: 2012 Feb 2 " @@ -8,7 +8,7 @@ " " ACKNOWLEDGEMENTS: " -" My thanks to Jrme Plt <Jerome.Plut@ens.fr>, who was the +" My thanks to Jérôme Plût <Jerome.Plut@ens.fr>, who was the " creator and maintainer of this syntax file for several years. " May I be as good at it as he has been. " diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim index 2a58ee43f6..535efc99d3 100644 --- a/runtime/syntax/pascal.vim +++ b/runtime/syntax/pascal.vim @@ -2,7 +2,7 @@ " Language: Pascal " Version: 2.8 " Last Change: 2004/10/17 17:47:30 -" Maintainer: Xavier Crgut <xavier.cregut@enseeiht.fr> +" Maintainer: Xavier Crégut <xavier.cregut@enseeiht.fr> " Previous Maintainer: Mario Eusebio <bio@dq.fct.unl.pt> " Contributors: Tim Chase <tchase@csc.com>, diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim index 396bf52b25..fcb9b0275d 100644 --- a/runtime/syntax/robots.vim +++ b/runtime/syntax/robots.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: "Robots.txt" files " Robots.txt files indicate to WWW robots which parts of a web site should not be accessed. -" Maintainer: Dominique Stphan (dominique@mggen.com) +" Maintainer: Dominique Stéphan (dominique@mggen.com) " URL: http://www.mggen.com/vim/syntax/robots.zip " Last change: 2001 May 09 diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim index f339f7ae6e..28c250b7c4 100644 --- a/runtime/syntax/rpl.vim +++ b/runtime/syntax/rpl.vim @@ -2,7 +2,7 @@ " Language: RPL/2 " Version: 0.15.15 against RPL/2 version 4.00pre7i " Last Change: 2012 Feb 03 by Thilo Six -" Maintainer: Jol BERTRAND <rpl2@free.fr> +" Maintainer: Joël BERTRAND <rpl2@free.fr> " URL: http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim " Credits: Nothing diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim index c856f9ffcf..f8e031ba21 100644 --- a/runtime/syntax/rtf.vim +++ b/runtime/syntax/rtf.vim @@ -7,7 +7,7 @@ " .hlp (windows help files) use compiled rtf files " rtf documentation at http://night.primate.wisc.edu/software/RTF/ " -" Maintainer: Dominique Stphan (dominique@mggen.com) +" Maintainer: Dominique Stéphan (dominique@mggen.com) " URL: http://www.mggen.com/vim/syntax/rtf.zip " Last change: 2001 Mai 02 diff --git a/runtime/syntax/tilde.vim b/runtime/syntax/tilde.vim index 3fdebf1e2e..d2a3360d24 100644 --- a/runtime/syntax/tilde.vim +++ b/runtime/syntax/tilde.vim @@ -1,7 +1,7 @@ " Vim syntax file " This file works only for Vim6.x " Language: Tilde -" Maintainer: Tobias Rundstrm <tobi@tildesoftware.net> +" Maintainer: Tobias Rundström <tobi@tildesoftware.net> " URL: http://www.tildesoftware.net " CVS: $Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $ diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim index d70ed63f74..22be56d725 100644 --- a/runtime/syntax/xkb.vim +++ b/runtime/syntax/xkb.vim @@ -2,7 +2,7 @@ " This is a GENERATED FILE. Please always refer to source file at the URI below. " Language: XKB (X Keyboard Extension) components " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz> -" Last Change: 2020 Oct 06 +" Last Change: 2020 Oct 18 " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim " Setup @@ -41,7 +41,7 @@ syn match xkbPhysicalKey "<\w\+>" syn keyword xkbPreproc augment include replace syn keyword xkbConstant False True syn keyword xkbModif override replace -syn keyword xkbIdentifier action affect alias allowExplicit approx baseColor button clearLocks color controls cornerRadius count ctrls description driveskbd font fontSize gap group groups height indicator indicatorDrivesKeyboard interpret key keys labelColor latchToLock latchMods left level_name map maximum minimum modifier_map modifiers name offColor onColor outline preserve priority repeat row section section setMods shape slant solid symbols text top type useModMapMods virtualModifier virtualMods virtual_modifiers weight whichModState width +syn keyword xkbIdentifier action affect alias allowExplicit approx baseColor button clearLocks color controls cornerRadius count ctrls description driveskbd font fontSize gap group groups height indicator indicatorDrivesKeyboard interpret key keys labelColor latchToLock latchMods left level_name map maximum minimum modifier_map modifiers name offColor onColor outline preserve priority repeat row section setMods shape slant solid symbols text top type useModMapMods virtualModifier virtualMods virtual_modifiers weight whichModState width syn keyword xkbFunction AnyOf ISOLock LatchGroup LatchMods LockControls LockGroup LockMods LockPointerButton MovePtr NoAction PointerButton SetControls SetGroup SetMods SetPtrDflt Terminate syn keyword xkbTModif default hidden partial virtual syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po index db44f50a46..a76dd8eeea 100644 --- a/src/nvim/po/af.po +++ b/src/nvim/po/af.po @@ -4129,8 +4129,6 @@ msgstr "E537: 'commentstring' moet leeg wees of %s bevat" msgid "E540: Unclosed expression sequence" msgstr "E540: Onvoltooide uitdrukkingreeks" -msgid "E541: too many items" -msgstr "E541: te veel items" msgid "E542: unbalanced groups" msgstr "E542: ongebalanseerde groepe" diff --git a/src/nvim/po/da.po b/src/nvim/po/da.po index b8d424552a..23d60087f2 100644 --- a/src/nvim/po/da.po +++ b/src/nvim/po/da.po @@ -4329,8 +4329,6 @@ msgstr "E538: Ingen understøttelse af mus" msgid "E540: Unclosed expression sequence" msgstr "E540: Ulukket udtryk-sekvens" -msgid "E541: too many items" -msgstr "E541: for mange punkter" msgid "E542: unbalanced groups" msgstr "E542: ubalancerede grupper" diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po index 5986a57488..77d5f7f826 100644 --- a/src/nvim/po/fi.po +++ b/src/nvim/po/fi.po @@ -4198,8 +4198,6 @@ msgstr "E537: commentstringin pitää olla tyhjä tai sisältää %s" msgid "E540: Unclosed expression sequence" msgstr "E540: Sulkematon lausekesarja" -msgid "E541: too many items" -msgstr "E541: liikaa kohteita" msgid "E542: unbalanced groups" msgstr "E542: epätasapainoisia ryhmiä" diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po index d1f9923fc5..bb93cf7e31 100644 --- a/src/nvim/po/fr.po +++ b/src/nvim/po/fr.po @@ -3945,8 +3945,6 @@ msgstr "Pour l'option %s" msgid "E540: Unclosed expression sequence" msgstr "E540: '}' manquant" -msgid "E541: too many items" -msgstr "E541: trop d'lments" msgid "E542: unbalanced groups" msgstr "E542: parenthses non quilibres" diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po index 7f71959902..abbb9c6583 100644 --- a/src/nvim/po/ga.po +++ b/src/nvim/po/ga.po @@ -4372,8 +4372,6 @@ msgstr "E538: Gan tacaocht luiche" msgid "E540: Unclosed expression sequence" msgstr "E540: Seicheamh gan dnadh" -msgid "E541: too many items" -msgstr "E541: an iomarca mreanna" msgid "E542: unbalanced groups" msgstr "E542: grpa neamhchothromaithe" diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po index c4680c5054..5dda7c59f5 100644 --- a/src/nvim/po/ja.euc-jp.po +++ b/src/nvim/po/ja.euc-jp.po @@ -4092,8 +4092,6 @@ msgstr "ץ: %s" msgid "E540: Unclosed expression sequence" msgstr "E540: λƤޤ" -msgid "E541: too many items" -msgstr "E541: Ǥ¿ޤ" msgid "E542: unbalanced groups" msgstr "E542: 롼פ礤ޤ" diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po index 307e22f76d..a169bd3589 100644 --- a/src/nvim/po/ja.po +++ b/src/nvim/po/ja.po @@ -4092,8 +4092,6 @@ msgstr "オプション: %s" msgid "E540: Unclosed expression sequence" msgstr "E540: 式が終了していません" -msgid "E541: too many items" -msgstr "E541: 要素が多過ぎます" msgid "E542: unbalanced groups" msgstr "E542: グループが釣合いません" diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po index 4a9941ae3e..e4a0b6cde5 100644 --- a/src/nvim/po/sr.po +++ b/src/nvim/po/sr.po @@ -4632,8 +4632,6 @@ msgstr "За опцију %s" msgid "E540: Unclosed expression sequence" msgstr "E540: Низ израза није затворен" -msgid "E541: too many items" -msgstr "E541: превише ставки" msgid "E542: unbalanced groups" msgstr "E542: неуравнотежене групе" diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po index bf3386d025..6ddb84f2b4 100644 --- a/src/nvim/po/tr.po +++ b/src/nvim/po/tr.po @@ -3990,8 +3990,6 @@ msgstr "%s seçeneği için" msgid "E540: Unclosed expression sequence" msgstr "E540: Kapatılmamış ifade sıralaması" -msgid "E541: too many items" -msgstr "E541: Çok fazla öge" msgid "E542: unbalanced groups" msgstr "E542: Dengelenmemiş gruplar" |