# HG changeset patch # User Bram Moolenaar # Date 1561162505 -7200 # Node ID 9ccb1ea9b2fcac61db5982dc6195e48d9de87645 # Parent 706c7a4f3cb44d059fcd461b15120e7f979ea0b0 Update runtime files commit https://github.com/vim/vim/commit/6c1e1570b1346de0d438fbb991bddab38c228290 Author: Bram Moolenaar Date: Sat Jun 22 02:13:00 2019 +0200 Update runtime files diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 8.1. Last change: 2019 Jun 15 +*autocmd.txt* For Vim version 8.1. Last change: 2019 Jun 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -876,14 +876,13 @@ OptionSet After setting an option. Th || indicates what option has been set. |v:option_type| indicates whether it's global - or local scoped + or local scoped. |v:option_command| indicates what type of set/let command was used (follow the tag to see the table). |v:option_new| indicates the newly set value. - |v:option_oldlocal| hass the old local value. - |v:option_oldglobal| hass the old global - value + |v:option_oldlocal| has the old local value. + |v:option_oldglobal| has the old global value. |v:option_old| indicates the old option value. |v:option_oldlocal| is only set when |:set| diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.1. Last change: 2019 Jun 17 +*eval.txt* For Vim version 8.1. Last change: 2019 Jun 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -8902,7 +8902,7 @@ sound_playevent({name} [, {callback}]) argument is the status: 0 sound was played to the end 1 sound was interrupted - 2 error occured after sound started + 2 error occurred after sound started Example: > func Callback(id, status) echomsg "sound " .. a:id .. " finished with " .. a:status diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 8.1. Last change: 2019 Jun 09 +*index.txt* For Vim version 8.1. Last change: 2019 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1241,6 +1241,7 @@ tag command action ~ |:compiler| :comp[iler] do settings for a specific compiler |:continue| :con[tinue] go back to :while |:confirm| :conf[irm] prompt user when confirmation required +|:const| :cons[t] create a variable as a constant |:copen| :cope[n] open quickfix window |:cprevious| :cp[revious] go to previous error |:cpfile| :cpf[ile] go to last error in previous file diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.1. Last change: 2019 May 07 +*intro.txt* For Vim version 8.1. Last change: 2019 Jun 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -65,7 +65,7 @@ contain links to the most recent version Frequently Asked Questions. Read this if you have problems. Vim home page: https://www.vim.org/ - Vim FAQ: https://vimhelp.appspot.com/vim_faq.txt.html + Vim FAQ: https://vimhelp.org/vim_faq.txt.html Downloading: https://www.vim.org/download.php diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.1. Last change: 2019 May 25 +*options.txt* For Vim version 8.1. Last change: 2019 Jun 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6804,7 +6804,7 @@ A jump table for the options with a shor "no" never "yes" always "number" display signs in the 'number' column. If the number - column is not present, then behaves like 'auto'. + column is not present, then behaves like "auto". *'smartcase'* *'scs'* *'nosmartcase'* *'noscs'* diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 8.1. Last change: 2019 Jun 15 +*popup.txt* For Vim version 8.1. Last change: 2019 Jun 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -308,7 +308,7 @@ popup_menu({text}, {options}) *popup \ 'filter': 'popup_filter_menu', \ }) < The current line is highlighted with a match using - PopupSelected, or |PmenuSel| if that is not defined. + "PopupSelected", or "PmenuSel" if that is not defined. Use {options} to change the properties. Should at least set "callback" to a function that handles the selected item. @@ -421,7 +421,7 @@ need them. POPUP_CREATE() ARGUMENTS *popup_create-usage* The first argument of |popup_create()| (and the second argument to -|popup_setttext()|) specifies the text to be displayed, and optionally text +|popup_settext()|) specifies the text to be displayed, and optionally text properties. It is in one of three forms: - a string - a list of strings @@ -478,7 +478,7 @@ The second argument of |popup_create()| hidden When TRUE the popup exists but is not displayed; use `popup_show()` to unhide it. {not implemented yet} - tabpage When -1: display the popup on all tabs. + tabpage When -1: display the popup on all tab pages. When 0 (the default): display the popup on the current tab page. Otherwise the number of the tab page the popup is @@ -523,7 +523,7 @@ The second argument of |popup_create()| When the list has two characters the first is used for the border lines, the second for the corners. By default a double line is used all around when - 'encoding' is "utf-8" and 'ambiwidth' is "single, + 'encoding' is "utf-8" and 'ambiwidth' is "single", otherwise ASCII characters are used. zindex Priority for the popup, default 50. Minimum value is 1, maximum value is 32000. @@ -653,7 +653,7 @@ Prompt the user to press y/Y or n/N: > *popup_menu-shortcut-example* Extend popup_filter_menu() with shortcut keys: > - call popup_menu('Save', 'Cancel', 'Discard'], { + call popup_menu(['Save', 'Cancel', 'Discard'], { \ 'filter': 'MyMenuFilter', \ 'callback': 'MyMenuHandler', \ }) diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 8.1. Last change: 2019 May 22 +*repeat.txt* For Vim version 8.1. Last change: 2019 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -280,9 +280,16 @@ For writing a Vim script, see chapter 41 after loading your .vimrc file. With this command it can be done earlier. - Packages will be loaded only once. After this command - it won't happen again. When the optional ! is added - this command will load packages even when done before. + Packages will be loaded only once. Using + `:packloadall` a second time will have no effect. + When the optional ! is added this command will load + packages even when done before. + + Note that when using `:packloadall` in the |vimrc| + file, the 'runtimepath' option is updated, and later + all plugins in 'runtimepath' will be loaded, which + means they are loaded again. Plugins are expected to + handle that. An error only causes sourcing the script where it happens to be aborted, further plugins will be loaded. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 8.1. Last change: 2019 Jun 01 +*syntax.txt* For Vim version 8.1. Last change: 2019 Jun 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3140,7 +3140,7 @@ in your <.vimrc>, and :set fdm=syntax. modeline at the end of your LaTeX file: > % vim: fdm=syntax If your system becomes too slow, then you might wish to look into > - https://vimhelp.appspot.com/vim_faq.txt.html#faq-29.7 + https://vimhelp.org/vim_faq.txt.html#faq-29.7 < *g:tex_nospell* Tex: No Spell Checking Wanted~ diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2261,6 +2261,8 @@ 90.5 usr_90.txt /*90.5* :con eval.txt /*:con* :conf editing.txt /*:conf* :confirm editing.txt /*:confirm* +:cons eval.txt /*:cons* +:const eval.txt /*:const* :continue eval.txt /*:continue* :cope quickfix.txt /*:cope* :copen quickfix.txt /*:copen* @@ -4769,6 +4771,9 @@ E991 eval.txt /*E991* E992 options.txt /*E992* E993 popup.txt /*E993* E994 eval.txt /*E994* +E995 eval.txt /*E995* +E996 eval.txt /*E996* +E996 popup.txt /*E996* E999 repeat.txt /*E999* EX intro.txt /*EX* EXINIT starting.txt /*EXINIT* @@ -8233,15 +8238,18 @@ popup_close() popup.txt /*popup_close()* popup_create() popup.txt /*popup_create()* popup_create-usage popup.txt /*popup_create-usage* popup_dialog() popup.txt /*popup_dialog()* +popup_dialog-example popup.txt /*popup_dialog-example* popup_filter_menu() popup.txt /*popup_filter_menu()* popup_filter_yesno() popup.txt /*popup_filter_yesno()* popup_getoptions() popup.txt /*popup_getoptions()* popup_getpos() popup.txt /*popup_getpos()* popup_hide() popup.txt /*popup_hide()* popup_menu() popup.txt /*popup_menu()* +popup_menu-shortcut-example popup.txt /*popup_menu-shortcut-example* popup_move() popup.txt /*popup_move()* popup_notification() popup.txt /*popup_notification()* popup_setoptions() popup.txt /*popup_setoptions()* +popup_settext() popup.txt /*popup_settext()* popup_show() popup.txt /*popup_show()* popupmenu-completion insert.txt /*popupmenu-completion* popupmenu-keys insert.txt /*popupmenu-keys* @@ -9333,6 +9341,7 @@ test_alloc_fail() eval.txt /*test_alloc_ test_autochdir() eval.txt /*test_autochdir()* test_feedinput() eval.txt /*test_feedinput()* test_garbagecollect_now() eval.txt /*test_garbagecollect_now()* +test_garbagecollect_soon() eval.txt /*test_garbagecollect_soon()* test_getvalue() eval.txt /*test_getvalue()* test_ignore_error() eval.txt /*test_ignore_error()* test_null_blob() eval.txt /*test_null_blob()* @@ -9545,8 +9554,11 @@ v:none eval.txt /*v:none* v:null eval.txt /*v:null* v:oldfiles eval.txt /*v:oldfiles* v:operator eval.txt /*v:operator* +v:option_command eval.txt /*v:option_command* v:option_new eval.txt /*v:option_new* v:option_old eval.txt /*v:option_old* +v:option_oldglobal eval.txt /*v:option_oldglobal* +v:option_oldlocal eval.txt /*v:option_oldlocal* v:option_type eval.txt /*v:option_type* v:prevcount eval.txt /*v:prevcount* v:profiling eval.txt /*v:profiling* @@ -9586,6 +9598,7 @@ v:true eval.txt /*v:true* v:val eval.txt /*v:val* v:var eval.txt /*v:var* v:version eval.txt /*v:version* +v:versionlong eval.txt /*v:versionlong* v:vim_did_enter eval.txt /*v:vim_did_enter* v:warningmsg eval.txt /*v:warningmsg* v:windowid eval.txt /*v:windowid* @@ -9744,6 +9757,7 @@ version7.txt version7.txt /*version7.txt version8.0 version8.txt /*version8.0* version8.1 version8.txt /*version8.1* version8.txt version8.txt /*version8.txt* +versionlong-variable eval.txt /*versionlong-variable* vi intro.txt /*vi* vi-differences vi_diff.txt /*vi-differences* vi-features vi_diff.txt /*vi-features* diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -1,4 +1,4 @@ -*textprop.txt* For Vim version 8.1. Last change: 2019 May 12 +*textprop.txt* For Vim version 8.1. Last change: 2019 Jun 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -56,7 +56,7 @@ A text property normally has the name of how to highlight the text. The property type can have these entries: "highlight" name of the highlight group to use "combine" when TRUE the text property highlighting is combined - with any syntax highligting, when omitted or FALSE the + with any syntax highlighting, when omitted or FALSE the text property highlighting replaces the syntax highlighting "priority" when properties overlap, the one with the highest diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.1. Last change: 2019 Jun 10 +*todo.txt* For Vim version 8.1. Last change: 2019 Jun 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -42,11 +42,6 @@ Ongoing work on text properties, see src Popup windows are being implemented, see |popup-window|. -Include tests: - test_assert.vim - test_paste.vim - shared.vim - Patch to fix session file when using multiple tabs. (Jason Franklin, 2019 May 20) Also put :argadd commands at the start for all buffers, so that their order @@ -57,7 +52,8 @@ Patch to add v:searchstat. (Takuya Fujiw Listener causes extra } to be inserted. (Paul Jolly, #4455) -Improvement to Travis config: Ozaki Kiichi, #4521 +Refactor: Move common things out of evalfunc.c, it's too big. +E.g. vim_localtime(). 'incsearch' with :s: (#3321) - Get E20 when using command history to get "'<,'>s/a/b" and no Visual area @@ -93,6 +89,8 @@ Terminal debugger: with another Vim instance. Terminal emulator window: +- When typing "exit" in a terminal window with a shell and it's the only + window, should exit Vim instead of editing another buffer. (#4539) - When the job in the terminal doesn't use mouse events, let the scroll wheel scroll the scrollback, like a terminal does at the shell prompt. #2490 And use modeless selection. #2962 @@ -125,11 +123,13 @@ Terminal emulator window: - When 'encoding' is not utf-8, or the job is using another encoding, setup conversions. -Add a way to play simple sounds? libcanberra appears to be widely spread. +Sound: support on Mac? Or does libcanberra work there? Patch to use forward slash for completion even when 'shellslash' is set. Adds 'completepathslash'. (Yasuhiro Matsumoto, 2018 Nov 15, #3612) +Patch to add win_splitmove() function. (Andy Massimino, #4561) + Completion mixes results from the current buffer with tags and other files. Happens when typing CTRL-N while still search for results. E.g., type "b_" in terminal.c and then CTRL-N twice. @@ -159,6 +159,8 @@ Does not build with MinGW out of the box Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May 13, #2910) Can't reproduce? +Columns and Rows are long, they should be int. + Errors found with random data: heap-buffer-overflow in alist_add (#2472) @@ -172,9 +174,6 @@ it's in a mapping. (2018 Oct 6, #2302, # Internal diff doesn't handle binary file like external diff does. (Mike Williams, 2018 Oct 30) -Add "number" to 'signcolumn': Put signs in the number column if it exists. -Otherwise behave like "yes". (Adam Stankiewicz, #4515) - Problem with :tlmenu: Detach item added with all modes? Issue #3563. Patch to use timers in matchparen. (Daniel Hahler, #1338) @@ -187,6 +186,8 @@ Bug: script written with "-W scriptout" read with "-s scriptin" expects escape codes. Probably "scriptout" needs to be adjusted. (Daniel Steinberg, 2019 Feb 24, #4041) +":registers" should indicate char/block/linewise. (Ayberk Aydin, #4546) + Patch for ambiguous width characters in libvterm on MS-Windows 10. (Nobuhiro Takasaki, #4411) @@ -195,6 +196,9 @@ Problem with colors in terminal window. Bug: "vipgw" does not put cursor back where it belongs. (Jason Franklin, 2019 Mar 5) +Some composing characters actually add a cell width to the character they are +on top off, making the whole thing two characters wide. (#4526) + Should we include some part of pull request #4505, not increment changedtick in some cases? E.g. for ":write" when the changed flag was already off, the buffer didn't change at all. @@ -256,6 +260,8 @@ https://lgtm.com/projects/g/vim/vim/aler Still a E315 error when using terminal. (Masato Nishihata, #3959) +Not existing directory in CDPATH leads to two shell calls. (#4525) + Use dict_iterate_start() / dict_iterate_next() instead of relying on the internals of the dict structure. @@ -431,6 +437,9 @@ MS-Windows: .lnk file not resolved prope Merge checking for 'cursorline' and 'concealcursor', see neovim #9492. +Request to add sign_setlist() to make it faster to add a lot of signs, e.g. +when adding a sign for every quickfix entry. (#4557) + Win32 key codes are messy. Mike Williams tried to fix that, but now old mappings no longer work. Create a new terminal for the better solution? diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell " Previous Maintainer: Lennart Schultz -" Last Change: Mar 26, 2019 -" Version: 186 +" Last Change: Jun 16, 2019 +" Version: 188 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) @@ -381,22 +381,23 @@ syn match shBQComment contained "#.\{-}\ " Here Documents: {{{1 " ========================================= +" Note : shHereDoc0[137] only had shDblQuoteList contained ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\\\=\z([^ \t|>]\+\)" matchgroup=shHereDoc01 end="^\z1\s*$" contains=@shDblQuoteList ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<\s*\"\z([^"]\+\)\"" matchgroup=shHereDoc02 end="^\z1\s*$" ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<-\s*\z([^ \t|>]\+\)" matchgroup=shHereDoc03 end="^\s*\z1\s*$" contains=@shDblQuoteList ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*'\z([^']\+\)'" matchgroup=shHereDoc04 end="^\s*\z1\s*$" ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*'\z([^']\+\)'" matchgroup=shHereDoc05 end="^\z1\s*$" ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\"\z([^"]\+\)\"" matchgroup=shHereDoc06 end="^\s*\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t|>]\+\)" matchgroup=shHereDoc07 end="^\z1\s*$" contains=@shDblQuoteList -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^ \t|>]\+\)'" matchgroup=shHereDoc08 end="^\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^ \t|>]\+\)\"" matchgroup=shHereDoc09 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t'"|>]\+\)" matchgroup=shHereDoc07 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^\t|>]\+\)'" matchgroup=shHereDoc08 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^\t|>]\+\)\"" matchgroup=shHereDoc09 end="^\z1\s*$" ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)" matchgroup=shHereDoc10 end="^\s*\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc11 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc11 end="^\s*\z1\s*$" contains=@shDblQuoteList ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*'\z([^']\+\)'" matchgroup=shHereDoc12 end="^\s*\z1\s*$" ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<-\s*\\\_$\_s*\"\z([^"]\+\)\"" matchgroup=shHereDoc13 end="^\s*\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|>]\+\)" matchgroup=shHereDoc14 end="^\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc15 end="^\s*\z1\s*$" -ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc15 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|>]\+\)" matchgroup=shHereDoc14 end="^\z1\s*$" contains=@shDblQuoteList +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc15 end="^\s*\z1\s*$" contains=@shDblQuoteList +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\z([^ \t|>]\+\)" matchgroup=shHereDoc15 end="^\s*\z1\s*$" contains=@shDblQuoteList " Here Strings: {{{1 " ============= diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Charles E. Campbell -" Last Change: Apr 01, 2019 -" Version: 113 +" Last Change: May 14, 2019 +" Version: 114 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " " Notes: {{{1 @@ -947,6 +947,7 @@ if has("conceal") && &enc == 'utf-8' call s:Greek('texGreek','\\eta\>' ,'η') call s:Greek('texGreek','\\theta\>' ,'θ') call s:Greek('texGreek','\\vartheta\>' ,'ϑ') + call s:Greek('texGreek','\\iota\>' ,'ι') call s:Greek('texGreek','\\kappa\>' ,'κ') call s:Greek('texGreek','\\lambda\>' ,'λ') call s:Greek('texGreek','\\mu\>' ,'μ') @@ -969,11 +970,12 @@ if has("conceal") && &enc == 'utf-8' call s:Greek('texGreek','\\Delta\>' ,'Δ') call s:Greek('texGreek','\\Theta\>' ,'Θ') call s:Greek('texGreek','\\Lambda\>' ,'Λ') - call s:Greek('texGreek','\\Xi\>' ,'Χ') + call s:Greek('texGreek','\\Xi\>' ,'Ξ') call s:Greek('texGreek','\\Pi\>' ,'Π') call s:Greek('texGreek','\\Sigma\>' ,'Σ') call s:Greek('texGreek','\\Upsilon\>' ,'Υ') call s:Greek('texGreek','\\Phi\>' ,'Φ') + call s:Greek('texGreek','\\Chi\>' ,'Χ') call s:Greek('texGreek','\\Psi\>' ,'Ψ') call s:Greek('texGreek','\\Omega\>' ,'Ω') delfun s:Greek diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 8.0 script " Maintainer: Charles E. Campbell -" Last Change: Mar 08, 2019 -" Version: 8.0-21 +" Last Change: Jun 16, 2019 +" Version: 8.0-22 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " Automatically generated keyword lists: {{{1 @@ -23,8 +23,8 @@ syn keyword vimCommand contained a arga[ syn keyword vimCommand contained ab argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] caddf[ile] ccl[ose] cfdo chd[ir] cle[arjumps] co[py] con[tinue] cr[ewind] d[elete] deletel delm[arks] diffo[ff] dir dp earlier elsei[f] endw[hile] files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] iuna[bbrev] keepalt la[st] later lcs lf[ile] lgr[ep] lli[st] lo[adview] lop[en] lua m[ove] mes mkvie[w] nbc[lose] noautocmd nu[mber] opt[ions] pc[lose] popu[p] prof[ile] ptN[ext] ptn[ext] pw[d] pyf[ile] pyxfile rec[over] reg[isters] ri[ght] rubyf[ile] sIe sIr sav[eas] sbl[ast] sc scl scscope sf[ind] sge sgr sig sip sm[ap] sno[magic] sp[lit] spellu[ndo] src srn startg[replace] sun[hide] sw[apname] syntime tabN[ext] tabfir[st] tabo[nly] tc[l] tf[irst] tma[p] tp[revious] tunma[p] unh[ide] v vie[w] vne[w] wh[ile] wn[ext] wundo xme xunme syn keyword vimCommand contained abc[lear] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cal[l] cd cfir[st] che[ckpath] clo[se] col[der] conf[irm] cs debug deletep delp diffp[atch] dj[ump] dr[op] ec em[enu] ene[w] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] j[oin] keepj[umps] lad[dexpr] lb[uffer] lcscope lfdo lgrepa[dd] lmak[e] loadk lp[revious] luado ma[rk] messages mod[e] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] th[row] tmapc[lear] tr[ewind] u[ndo] unl ve[rsion] vim[grep] vs[plit] win[size] wp[revious] wv[iminfo] xmenu xunmenu syn keyword vimCommand contained abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] ia in ju[mps] keepp[atterns] laddb[uffer] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do pythonx qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tj[ump] tn[ext] try una[bbreviate] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo -syn keyword vimCommand contained al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] pyx quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs tcd te[aroff] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank] -syn keyword vimCommand contained ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext] tch[dir] +syn keyword vimCommand contained al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] pyx quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs te[aroff] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank] +syn keyword vimCommand contained ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext] syn match vimCommand contained "\" syn keyword vimStdPlugin contained Arguments Break Clear Continue DiffOrig Evaluate Finish Gdb Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns @@ -166,7 +166,7 @@ syn match vimNumber "-\d\+\%(\.\d\+\%([e syn match vimNumber "\<0[xX]\x\+" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment syn match vimNumber "\%(^\|\A\)\zs#\x\{6}" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment -" All vimCommands are contained by vimIsCommands. {{{2 +" All vimCommands are contained by vimIsCommand. {{{2 syn match vimCmdSep "[:|]\+" skipwhite nextgroup=vimAddress,vimAutoCmd,vimEcho,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd syn match vimIsCommand "\<\h\w*\>" contains=vimCommand syn match vimVar contained "\<\h[a-zA-Z0-9#_]*\>" @@ -201,7 +201,7 @@ syn keyword vimFTOption contained detect " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking. -syn cluster vimAugroupList contains=vimAugroup,vimIsCommand,vimCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption +syn cluster vimAugroupList contains=vimAugroup,vimIsCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimNotFunc,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'a' syn region vimAugroup fold matchgroup=vimAugroupKey start="\\ze\s\+\K\k*" end="\\ze\s\+[eE][nN][dD]\>" contains=vimAutoCmd,@vimAugroupList else @@ -217,8 +217,8 @@ syn keyword vimAugroupKey contained aug[ " ========= syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue syn match vimOper "\%#=1$==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=$[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile -syn match vimOper "$\" skipwhite nextgroup=vimString,vimSpecFile -syn match vimOper "||\|&&\|[-+.]" skipwhite nextgroup=vimString,vimSpecFile +syn match vimOper "\(\" skipwhite nextgroup=vimString,vimSpecFile +syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=@vimOperGroup syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror") @@ -255,7 +255,7 @@ syn match vimSpecFileMod "\(:[phtre]$\+ " User-Specified Commands: {{{2 " ======================= -syn cluster vimUserCmdList contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFilter,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine +syn cluster vimUserCmdList contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine syn keyword vimUserCommand contained com[mand] syn match vimUserCmd "\.*$" contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList syn match vimUserAttrbError contained "-\a\+\ze\s" @@ -334,13 +334,14 @@ syn match vimSubstFlags contained "[&c syn match vimString "[^(,]'[^']\{-}\zs'" " Marks, Registers, Addresses, Filters: {{{2 -syn match vimMark "'[a-zA-Z0-9]\ze[-+,!]" nextgroup=vimOper,vimMarkNumber,vimSubst -syn match vimMark "'[<>]\ze[-+,!]" nextgroup=vimOper,vimMarkNumber,vimSubst -syn match vimMark ",\zs'[<>]\ze" nextgroup=vimOper,vimMarkNumber,vimSubst -syn match vimMark "[!,:]\zs'[a-zA-Z0-9]" nextgroup=vimOper,vimMarkNumber,vimSubst -syn match vimMark "\]\ze[-+,!]" nextgroup=vimFilter,vimMarkNumber,vimSubst +syn match vimMark ",\zs'[<>]\ze" nextgroup=vimFilter,vimMarkNumber,vimSubst +syn match vimMark "[!,:]\zs'[a-zA-Z0-9]" nextgroup=vimFilter,vimMarkNumber,vimSubst +syn match vimMark "\'lc=1 @@ -433,17 +434,18 @@ syn case match " ========================== syn match vimFunc "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*(" contains=vimFuncName,vimUserFunc,vimExecute syn match vimUserFunc contained "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\" contains=vimNotation -syn match vimNotFunc "\\|\\|\\|\" " Errors And Warnings: {{{2 " ==================== if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror") syn match vimFunctionError "\s\zs[a-z0-9]\i\{-}\ze\s*(" contained contains=vimFuncKey,vimFuncBlank -" syn match vimFunctionError "\s\zs\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\d\i\{-}\ze\s*(" contained contains=vimFuncKey,vimFuncBlank + syn match vimFunctionError "\s\zs\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\d\i\{-}\ze\s*(" contained contains=vimFuncKey,vimFuncBlank syn match vimElseIfErr "\" syn match vimBufnrWarn /\\|\\|\\|\" skipwhite nextgroup=vimOper,vimOperParen,vimVar,vimFunc,vimNotation + " Norm {{{2 " ==== syn match vimNorm "\