diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-26 17:00:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-26 17:00:44 +0200 |
| commit | 2547aa930b59f5e2bcb70e81d5a57ed461e59b4f (patch) | |
| tree | 83dd4b387047f169ffffaed3585271574278c5c5 /runtime | |
| parent | d3bb6a82a51d549bbd597bb4e94d8f074009be2a (diff) | |
| download | vim-git-2547aa930b59f5e2bcb70e81d5a57ed461e59b4f.tar.gz | |
Update runtime files.
Diffstat (limited to 'runtime')
44 files changed, 259 insertions, 165 deletions
diff --git a/runtime/autoload/decada.vim b/runtime/autoload/decada.vim index 7741ff057..5124429a7 100644 --- a/runtime/autoload/decada.vim +++ b/runtime/autoload/decada.vim @@ -25,7 +25,7 @@ function decada#Unit_Name () dict " {{{1 " Convert filename into acs unit: " 1: remove the file extenstion. " 2: replace all double '_' or '-' with an dot (which denotes a separate) - " 3: remove a trailing '_' (wich denotes a specification) + " 3: remove a trailing '_' (which denotes a specification) return substitute (substitute (expand ("%:t:r"), '__\|-', ".", "g"), '_$', "", '') endfunction decada#Unit_Name " }}}1 diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 97733b5db..d1a92df64 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -77,7 +77,7 @@ Arabic requires ISO-8859-6 as well as Presentation Form-B fonts (without Form-B, Arabic will _NOT_ be usable). It is highly recommended that users search for so-called 'ISO-10646-1' fonts. Do an Internet search or check www.arabeyes.org for further -info on where to attain the necessary Arabic fonts. +info on where to obtain the necessary Arabic fonts. Font Installation @@ -123,7 +123,7 @@ o Setting the appropriate character Encoding > :set encoding=utf-8 < - to your .vimrc file (entering the command manually into you Vim + to your .vimrc file (entering the command manually into your Vim window is highly discouraged). In short, include ':set encoding=utf-8' to your .vimrc file. diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 96177f35f..36f72448c 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1755,7 +1755,7 @@ Some examples: Automatic formatting *auto-format* *autoformat* When the 'a' flag is present in 'formatoptions' text is formatted -automatically when inserting text or deleting text. This works nice for +automatically when inserting text or deleting text. This works nicely for editing text paragraphs. A few hints on how to use this: - You need to properly define paragraphs. The simplest is paragraphs that are diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 8e4e2a018..d2b3f6b46 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 8.2. Last change: 2020 Apr 23 +*cmdline.txt* For Vim version 8.2. Last change: 2020 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 191dc7bb1..e24f7e945 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 8.2. Last change: 2019 May 05 +*digraph.txt* For Vim version 8.2. Last change: 2020 Jul 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -33,6 +33,8 @@ An alternative is using the 'keymap' option. it is the Unicode character, see |digraph-encoding|. Example: > :digr e: 235 a: 228 +< You can use `:exe` to enter a hex number: > + :exe 'digr += ' .. 0x2A72 < Avoid defining a digraph with '_' (underscore) as the first character, it has a special meaning in the future. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index ed4f8aab0..d8994ef00 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.2. Last change: 2020 Jul 19 +*eval.txt* For Vim version 8.2. Last change: 2020 Jul 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1994,6 +1994,8 @@ v:mouse_col Column number for a mouse click obtained with |getchar()|. *v:none* *none-variable* *None* v:none An empty String. Used to put an empty item in JSON. See |json_encode()|. + This can also be used as a function argument to use the + default value, see |none-function_argument|. When used as a number this evaluates to zero. When used as a string this evaluates to "v:none". > echo v:none @@ -11710,7 +11712,7 @@ The argument default expressions are evaluated at the time of the function call, not definition. Thus it is possible to use an expression which is invalid the moment the function is defined. The expressions are also only evaluated when arguments are not specified during a call. - + *none-function_argument* You can pass |v:none| to use the default expression. Note that this means you cannot pass v:none as an ordinary value when an argument has a default expression. diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index dbafa2834..e8490d50f 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -312,7 +312,7 @@ can create any of the following: > $VIM/vimfiles/indent/sqlite.vim No changes are necessary to the SQLSetType function. It will automatically -pickup the new SQL files and load them when you issue the SQLSetType command. +pick up the new SQL files and load them when you issue the SQLSetType command. ============================================================================== @@ -519,7 +519,7 @@ beginning with those characters. > 4.3.2 Column Completion: *sql-completion-columns* The SQL completion plugin can also display a list of columns for particular -tables. The column completion is trigger via <C-C>c. +tables. The column completion is triggered via <C-C>c. NOTE: The following example uses <Right> to trigger a column list while the popup window is active. @@ -727,7 +727,7 @@ your platform (often a case on *nix) you define the following variable in your |vimrc|: > let g:omni_sql_no_default_maps = 1 -Do no edit ftplugin/sql.vim directly! If you change this file your changes +Do not edit ftplugin/sql.vim directly! If you change this file your changes will be over written on future updates. Vim has a special directory structure which allows you to make customizations without changing the files that are included with the Vim distribution. If you wish to customize the maps diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index c142f231b..0ad43d449 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -843,11 +843,10 @@ When modifyOtherKeys is enabled you can map <C-[> and <C-S-{>: > imap <C-S-{> {{{ Without modifyOtherKeys <C-[> and <C-S-{> are indistinguishable from Esc. -A known side effect effect is that in Insert mode the raw escape sequence is -inserted after the CTRL-V key. This can be used to check whether -modifyOtherKeys is enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you -get one byte then modifyOtherKeys is off, if you get <1b>27;5;118~ then it is -on. +A known side effect is that in Insert mode the raw escape sequence is inserted +after the CTRL-V key. This can be used to check whether modifyOtherKeys is +enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you get one byte then +modifyOtherKeys is off, if you get <1b>27;5;118~ then it is on. When the 'esckeys' option is off, then modifyOtherKeys will be disabled in Insert mode to avoid every key with a modifier causing Insert mode to end. diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 6a973fdc0..bbfd5d38c 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -128,7 +128,7 @@ There are several ways to enter multi-byte characters: - For MS-Windows IME can be used. See |IME|. - For all systems keymaps can be used. See |mbyte-keymap|. -The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose +The options 'iminsert', 'imsearch' and 'imcmdline' can be used to choose the different input methods or disable them temporarily. ============================================================================== @@ -141,8 +141,8 @@ in, or just use a certain locale inside Vim. WHAT IS A LOCALE? *locale* -There are many of languages in the world. And there are different cultures -and environments at least as much as the number of languages. A linguistic +There are many languages in the world. And there are different cultures and +environments at least as many as the number of languages. A linguistic environment corresponding to an area is called "locale". This includes information about the used language, the charset, collating order for sorting, date format, currency format and so on. For Vim only the language and charset @@ -889,7 +889,7 @@ input_server_name is your |IM-server| name (check your |IM-server| your_input_style is one of |OverTheSpot|, |OffTheSpot|, |Root|. See also |xim-input-style|. -*international may not necessary if you use X11R6. +*international may not be necessary if you use X11R6. *.inputMethod and *.preeditType are optional if you use X11R6. For example, when you are using kinput2 as |IM-server|, > @@ -952,7 +952,7 @@ automatically. This works on not only insert-normal mode, but also search-command input and replace mode. -The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose +The options 'iminsert', 'imsearch' and 'imcmdline' can be used to choose the different input methods or disable them temporarily. WHAT IS IME diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6a9e2ed0e..d98307e30 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.2. Last change: 2020 Jul 05 +*options.txt* For Vim version 8.2. Last change: 2020 Jul 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7711,7 +7711,6 @@ A jump table for the options with a short description can be found at |Q_op|. on Amiga: "amiga" on Haiku: "xterm" on Mac: "mac-ansi" - on MiNT: "vt52" on Unix: "ansi" on VMS: "ansi" on Win 32: "win32") diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 68788424f..fa49db875 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -30,8 +30,8 @@ can be changed at compile time. Because terminal updating under Unix is often slow (e.g. serial line terminal, shell window in suntools), the 'showcmd' and 'ruler' options -are default off. If you have a fast terminal, try setting them on. You might -also want to set 'ttyfast'. +are off by default. If you have a fast terminal, try setting them on. You +might also want to set 'ttyfast'. When using Vim in an xterm the mouse clicks can be used by Vim by setting 'mouse' to "a". If there is access to an X-server gui style copy/paste will diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 7b0efddbb..d14e7d918 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -642,7 +642,7 @@ disallowed though. This assumes you write one or more plugins that you distribute as a package. If you have two unrelated plugins you would use two packages, so that Vim -users can chose what they include or not. Or you can decide to use one +users can choose what they include or not. Or you can decide to use one package with optional plugins, and tell the user to add the ones he wants with `:packadd`. diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index 7a6c8c860..81ced875c 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -69,7 +69,7 @@ o Invocations + 'rightleft' ('rl') sets window orientation to right-to-left. + 'delcombine' ('deco'), boolean, if editing UTF-8 encoded languages, allows one to remove a composing character which gets superimposed - on those that proceeded them (some languages require this). + on those that preceded them (some languages require this). + 'rightleftcmd' ('rlc') sets the command-line within certain modes (such as search) to be utilized in right-to-left orientation as well. diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index a8ce68541..1e88a62ff 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -78,7 +78,7 @@ used by popup windows where 'cursorline' is set. *sign-priority* Each placed sign is assigned a priority value. When multiple signs are placed on the same line, the attributes of the sign with the highest priority is used -independent of the sign group. The default priority for a sign is 10. The +independently of the sign group. The default priority for a sign is 10. The priority is assigned at the time of placing a sign. When the line on which the sign is placed is deleted, the sign is moved to the diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 2096a34b5..8effaf55a 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1937,7 +1937,7 @@ new highlightings for the following groups.: Debug, DebugSpecial, DebugString, DebugBoolean, DebugType which are used for the statement itself, special characters used in debug strings, strings, boolean constants and types (this, super) respectively. I -have opted to chose another background for those statements. +have opted to choose another background for those statements. Javadoc is a program that takes special comments out of Java program files and creates HTML pages. The standard configuration will highlight this HTML code diff --git a/runtime/doc/tags b/runtime/doc/tags index 96022b70d..243b25ac6 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1979,6 +1979,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* :<sfile> cmdline.txt /*:<sfile>* :<sflnum> cmdline.txt /*:<sflnum>* :<slnum> cmdline.txt /*:<slnum>* +:<stack> cmdline.txt /*:<stack>* := various.txt /*:=* :> change.txt /*:>* :? cmdline.txt /*:?* @@ -3647,6 +3648,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* <sfile> cmdline.txt /*<sfile>* <sflnum> cmdline.txt /*<sflnum>* <slnum> cmdline.txt /*<slnum>* +<stack> cmdline.txt /*<stack>* <xCSI> intro.txt /*<xCSI>* <xDown> term.txt /*<xDown>* <xEnd> term.txt /*<xEnd>* @@ -3898,6 +3900,7 @@ E1050 vim9.txt /*E1050* E107 eval.txt /*E107* E108 eval.txt /*E108* E109 eval.txt /*E109* +E1092 vim9.txt /*E1092* E1094 vim9.txt /*E1094* E11 cmdline.txt /*E11* E110 eval.txt /*E110* @@ -8198,6 +8201,7 @@ no_plugin_maps filetype.txt /*no_plugin_maps* nocombine syntax.txt /*nocombine* non-greedy pattern.txt /*non-greedy* non-zero-arg eval.txt /*non-zero-arg* +none-function_argument eval.txt /*none-function_argument* none-variable eval.txt /*none-variable* normal-index index.txt /*normal-index* not-compatible usr_01.txt /*not-compatible* diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt index 53ed0818e..f1173a1f0 100644 --- a/runtime/doc/testing.txt +++ b/runtime/doc/testing.txt @@ -1,4 +1,4 @@ -*testing.txt* For Vim version 8.2. Last change: 2020 Jul 09 +*testing.txt* For Vim version 8.2. Last change: 2020 Jul 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index a04a5112b..f9ebf2d58 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.2. Last change: 2020 Jul 10 +*todo.txt* For Vim version 8.2. Last change: 2020 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -39,25 +39,36 @@ browser use: https://github.com/vim/vim/issues/1234 -------------------- Known bugs and current work ----------------------- Making everything work: -- in Vim9 script expressions are evaluated differently, not using a type. - e.g. "'' == 0" does not give an error and evaluates to true. -- cannot put # comment after assert() in :def function -- more return types depending on the first argument, like sort(). +- more items in https://github.com/vim/vim/issues/6507 +- More "goto failed" with check for trylevel. +- memory leak in test_vim9_script - Check that when sourcing a Vim9 script, only the global items can be used. - :put with a "=" register argument doesn't work, need to find the expression and compile it. (#6397) -- should "'text'->method()" work? 't is a range, but 'text isn't. +- At the script level, keep script variables local to the block they are + declared in? Need to remember what variables were declared and delete them + when leaving the block. +- Implement { } block at the script level. +- need to check type when a declaration specifies a type: #6507 + let nr: number = 'asdf' +- Make map() give an error if the resulting type is wrong. + Add mapnew() to create a new List/Dict for the result, which can have a + different value type. +- Implement "export {one, two three}". +- ISN_CHECKTYPE could use check_argtype() - Slice of list: [1, 2, 3][1:2]. +- give error for variable name: + let p = function('NoSuchFunc') - Give runtime error if function argument is wrong. def Increment(nr: number) range(3)->Increment() - Expand `=expr` in :next, :argedit, :argadd, :argdelete, :drop - Expand `=expr` in :vimgrep, :vimgrepadd, :lvimgrep, :lvimgrepadd - Expand `=expr` in :mkspell -- Make "true" and "false" work in vim9script - Test that a function defined inside a :def function is local to that function, g: functions can be defined and script-local functions cannot be defined. +- Support passing v:none to use the default argument value. (#6504) - make 0 == 'string' fail on the script level, like inside :def. - Check that when using a user function name without prefix, it does not find a global function. Prefixing g: is required. @@ -77,10 +88,6 @@ Making everything work: - memory leaks in test_vim9_cmd - When evaluating constants for script variables, some functions could work: has('asdf'), len('string') -- Support type for ":let"/":const" at script level for Vim9 script. - (Ben Jackson, #5671) - Can we share the code from ex_let_const() between direct execution and - compiling? - Implement "as Name" in "import Item as Name from ..." - Disallow unlet for local/script/imported vars - Make "++nr" work. @@ -91,6 +98,7 @@ Making everything work: - eval_expr() call in dbg_parsearg() and debuggy_find() - has() is compiled as a constant, but some checks are dynamic. Check for dynamic values, such as "gui_running". +- Implement command modifiers, such as "silent". (#6530) New syntax and functionality: Improve error checking: - "echo Func()" is an error if Func() does not return anything. @@ -139,11 +147,15 @@ Further improvements: Popup windows: - Cursor not updated before a redraw, making it jump. (#5943) +- Add a termcap entry for changing the cursor when it goes under the popup and + back. like t_SI and t_EI (t_SU and t_EU, where "U" means under?) - With terminal in popup, allow for popup_hide() to temporarily hide it.? - Fire some autocommand event after a new popup window was created and positioned? PopupNew? Could be used to set some options or move it out of the way. (#5737) However, it may also cause trouble, changing the popup of another plugin. +- Add a way to use popup_menu() synchronously: instead of invoking the + callback, return the choice. (Ben Jackson, #6534) - Use popup (or popup menu) for command line completion - When using a popup for the info of a completion menu, and there is not enough space, let the popup overlap with the menu. (#4544) @@ -199,6 +211,9 @@ Terminal debugger: Terminal emulator window: - No support for underline color, t_8u. +- When in terminal-Normal mode when the job finishes, the cursor jumps to the + end but the window is not updated. This only happens when typing "a". + :term bash -c "for V in {0..5}; do echo $V; sleep 1; done" - When started with ":terminal ++close" and the shell exits but there is a background process, the window remains open, because the channel still exists (and output still shows). Perhaps close the window when an explicit @@ -238,7 +253,7 @@ Terminal emulator window: conversions. Error numbers available: -E489, E610, E611, E653, E856 +E610, E611, E653 Remove SPACE_IN_FILENAME ? It is only used for completion. @@ -269,8 +284,15 @@ autocommands for the buffer lifecycle: BufIsRenamed (after buffer ID gets another name) The buffer list and windows are locked, no changes possible -How about removing Atari MiNT support? - src/Make_mint.mak, src/os_mint.h, matches with __MINT__ +Make it possible to map (console and GUI): #6457 + <C-[> 0x27 or is this <Esc> ? + <C-\> 0x28 + <C-]> 0x29 + <C-^> 0x30 + <C-_> 0x31 + +Patch for Template string: #4634 +Have another look at the implementation. Add the <=> (spaceship) operator and "cond ?< expr ?= expr ?> expr" replace this: @@ -281,6 +303,13 @@ Add the <=> (spaceship) operator and "cond ?< expr ?= expr ?> expr" let res = GetLeftFunc() <=> GetRightFunc() ?< lower ?= equal ?> upper Patch to make :q work with local arglist. (Christian Brabandt, #6286) +Lua: updating wrong buffer when using newly created, unloaded buffer. +(#6539) + +When "+ register is set then "" points to it. If another Vim grabs the "+ +register, then "" doesn't contain anything. Make it still follow "+. +(#6435) + Patch to fix drawing error with DirectX. (James Grant, #5688) Causes flicker on resizing. Workaround from Ken Takata. How about only setting the attribute when part of the Vim window is offscreen? @@ -347,6 +376,10 @@ Test loose_clipboard() by selecting text before suspending. Undo puts cursor in wrong line after "cG<Esc>" undo. +Implement completion for "breakadd". Should expand the second argument, e.g. +"func", and then function names after ":breakadd func". Including +script-local functions. + :unmap <c-n> gives error but does remove the mapping. (Antony Scriven, 2019 Dec 19) @@ -386,10 +419,6 @@ behavior of i_CTRl-R_CTRL-R differs from documentation. (Paul Desmond Parker, goes to any buffer, and then :bnext skips help buffers, since they are unlisted. (#4478) -Patch for Template string: #4634 -Copies the text twice, not very efficient. Requires a separate implementation -for Vim9 script, compiling the string parts and expressions. - Statusline highlighting error, off by one. (#5599) ":find" with 'path' set to "data*" does not find files, while completion does @@ -1928,13 +1957,6 @@ Szamotulski, 2012 Nov 8) Session file creation: 'autochdir' causes trouble. Keep it off until after loading all files. -MS-Windows resizing problems: -- Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun - 20. Uses getWindowRect() instead of GetWindowPlacement() -- Win32: When the taskbar is at the top of the screen creating the tabbar - causes the window to move unnecessarily. (William E. Skeith III, 2012 Jan - 12) Patch: 2012 Jan 13 Needs more work (2012 Feb 2) - 'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23) Patch to append regexp to tag commands to make it possible to select one out diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index 47368441a..fa8fdb6e1 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -434,7 +434,7 @@ redefined without changing the search pattern. /\f\+ -The "\f" items stands for file name characters. Thus this matches a sequence +The "\f" item stands for file name characters. Thus this matches a sequence of characters that can be a file name. Which characters can be part of a file name depends on the system you are using. On MS-Windows, the backslash is included, on Unix it is not. This is diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index d5381a708..c1f3641f0 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -226,7 +226,7 @@ We will use "82" here, which is version 8.2. This is all you need for the second method. Just launch the executable, and follow the prompts. -For the first method you must chose one of the binary archives. These are +For the first method you must choose one of the binary archives. These are available: gvim82.zip The normal MS-Windows GUI version. diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index 355cc79b5..3cd105b89 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -7882,7 +7882,7 @@ Files: src/buffer.c, src/ex_cmds.c, src/fileio.c, src/globals.h, Patch 6.1.221 Problem: Changing case may not work properly, depending on the current locale. -Solution: Add the 'casemap' option to let the user chose how changing case +Solution: Add the 'casemap' option to let the user choose how changing case is to be done. Also fix lowering case when an UTF-8 character doesn't keep the same byte length. diff --git a/runtime/doc/vim-da.1 b/runtime/doc/vim-da.1 index 3437bbcd2..669974132 100644 --- a/runtime/doc/vim-da.1 +++ b/runtime/doc/vim-da.1 @@ -147,7 +147,7 @@ Se ":help search\-pattern" for tilgngelige sgemnstre. {kommando} fortolkes som en Ex-kommando. Hvis {kommando} indeholder mellemrum, s skal den omsluttes af dobbelte citationstegn (det afhnger af den skal der bruges). -Eksempel: Vim "+set si" main.c +Eksempel: vim "+set si" main.c .br Bemrk: Du kan bruge op til 10 "+"- eller "\-c"-kommandoer. .TP diff --git a/runtime/doc/vim-da.UTF-8.1 b/runtime/doc/vim-da.UTF-8.1 index f619e4a05..97e06a02b 100644 --- a/runtime/doc/vim-da.UTF-8.1 +++ b/runtime/doc/vim-da.UTF-8.1 @@ -147,7 +147,7 @@ Se ":help search\-pattern" for tilgængelige søgemønstre. {kommando} fortolkes som en Ex-kommando. Hvis {kommando} indeholder mellemrum, så skal den omsluttes af dobbelte citationstegn (det afhænger af den skal der bruges). -Eksempel: Vim "+set si" main.c +Eksempel: vim "+set si" main.c .br Bemærk: Du kan bruge op til 10 "+"- eller "\-c"-kommandoer. .TP diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 index 209ab915c..ede25ff2c 100644 --- a/runtime/doc/vim-fr.1 +++ b/runtime/doc/vim-fr.1 @@ -156,7 +156,7 @@ Excute {commande} aprs la lecture du premier fichier. {commande} est interprte comme une commande Ex. Si la {commande} contient des espaces, elle doit tre entoure de doubles-apostrophes (cela dpend du shell utilis). -Exemple : Vim "+set si" main.c +Exemple : vim "+set si" main.c .br Note : vous pouvez utiliser jusqu' 10 commandes "+" ou "\-c". .TP diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 index 67be10667..453772229 100644 --- a/runtime/doc/vim-fr.UTF-8.1 +++ b/runtime/doc/vim-fr.UTF-8.1 @@ -156,7 +156,7 @@ Exécute {commande} après la lecture du premier fichier. {commande} est interprétée comme une commande Ex. Si la {commande} contient des espaces, elle doit être entourée de doubles-apostrophes (cela dépend du shell utilisé). -Exemple : Vim "+set si" main.c +Exemple : vim "+set si" main.c .br Note : vous pouvez utiliser jusqu'à 10 commandes "+" ou "\-c". .TP diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 index 0ab3eff0d..75d0ea94d 100644 --- a/runtime/doc/vim-it.1 +++ b/runtime/doc/vim-it.1 @@ -150,7 +150,7 @@ primo file stato letto. {comando} interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici (o altro delimitatore, a seconda della shell che si sta usando). -Esempio: Vim "+set si" main.c +Esempio: vim "+set si" main.c .br Note: Si possono avere fino a 10 comandi "+" o "\-c". .TP diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 index 51e7e043d..80c18262f 100644 --- a/runtime/doc/vim-it.UTF-8.1 +++ b/runtime/doc/vim-it.UTF-8.1 @@ -150,7 +150,7 @@ primo file è stato letto. {comando} è interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici (o altro delimitatore, a seconda della shell che si sta usando). -Esempio: Vim "+set si" main.c +Esempio: vim "+set si" main.c .br Note: Si possono avere fino a 10 comandi "+" o "\-c". .TP diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1 index d506b33c9..c1ec05f03 100644 --- a/runtime/doc/vim-pl.1 +++ b/runtime/doc/vim-pl.1 @@ -150,7 +150,7 @@ wzorce wyszukiwania. {polecenie} jest interpretowane jako polecenie Ex. Jeli {poleceni} zawiera biae znaki musi by umieszczone w podwjnych cudzysowach (zaley to od uywanej powoki). -Przykad: Vim "+set si" main.c +Przykad: vim "+set si" main.c .br Uwaga: Mona uy do 10 polece "+" lub "\-c". .TP diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/vim-pl.UTF-8.1 index f3551d2f6..26c1b11de 100644 --- a/runtime/doc/vim-pl.UTF-8.1 +++ b/runtime/doc/vim-pl.UTF-8.1 @@ -150,7 +150,7 @@ wzorce wyszukiwania. {polecenie} jest interpretowane jako polecenie Ex. Jeśli {poleceni} zawiera białe znaki musi być umieszczone w podwójnych cudzysłowach (zależy to od używanej powłoki). -Przykład: Vim "+set si" main.c +Przykład: vim "+set si" main.c .br Uwaga: Można użyć do 10 poleceń "+" lub "\-c". .TP diff --git a/runtime/doc/vim-tr.1 b/runtime/doc/vim-tr.1 index c1f5a3529..8e7bb4f41 100644 --- a/runtime/doc/vim-tr.1 +++ b/runtime/doc/vim-tr.1 @@ -145,7 +145,7 @@ Kullanlabilir arama dizgileri iin ":help search\-pattern" yazn. {komut} bir Ex komutu olarak iletilir. Eer {komut} boluk ieriyorsa ift trnak ierisine alnmaldr (bu kullanlan kabua baldr). -rnek: Vim "+set si" main.c +rnek: vim "+set si" main.c .br Not: 10 taneye kadar "+" veya "\-c" komutu kullanabilirsiniz. .TP diff --git a/runtime/doc/vim-tr.UTF-8.1 b/runtime/doc/vim-tr.UTF-8.1 index 0e2573463..c41980541 100644 --- a/runtime/doc/vim-tr.UTF-8.1 +++ b/runtime/doc/vim-tr.UTF-8.1 @@ -145,7 +145,7 @@ Kullanılabilir arama dizgileri için ":help search\-pattern" yazın. {komut} bir Ex komutu olarak işletilir. Eğer {komut} boşluk içeriyorsa çift tırnak içerisine alınmalıdır (bu kullanılan kabuğa bağlıdır). -Örnek: Vim "+set si" main.c +Örnek: vim "+set si" main.c .br Not: 10 taneye kadar "+" veya "\-c" komutu kullanabilirsiniz. .TP diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index d19317d4d..a2ca0e28a 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -146,7 +146,7 @@ See ":help search\-pattern" for the available search patterns. {command} is interpreted as an Ex command. If the {command} contains spaces it must be enclosed in double quotes (this depends on the shell that is used). -Example: Vim "+set si" main.c +Example: vim "+set si" main.c .br Note: You can use up to 10 "+" or "\-c" commands. .TP diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man index c90547574..e905a82e6 100644 --- a/runtime/doc/vim.man +++ b/runtime/doc/vim.man @@ -110,7 +110,7 @@ OPTIONS read. {command} is interpreted as an Ex command. If the {command} contains spaces it must be enclosed in double quotes (this depends on the shell that is used). Example: - Vim "+set si" main.c + vim "+set si" main.c Note: You can use up to 10 "+" or "-c" commands. -S {file} {file} will be sourced after the first file has been read. diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index 748dd7cd5..2ba227527 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 8.2. Last change: 2020 Jul 17 +*vim9.txt* For Vim version 8.2. Last change: 2020 Jul 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -184,8 +184,9 @@ To intentionally avoid a variable being available later, a block can be used: echo temp " Error! An existing variable cannot be assigned to with `:let`, since that implies a -declaration. An exception is global variables: these can be both used with -and without `:let`, because there is no rule about where they are declared. +declaration. Global, window, tab, buffer and Vim variables can only be used +without `:let`, because they are are not really declared, they can also be +deleted with `:unlet`. Variables cannot shadow previously defined variables. Variables may shadow Ex commands, rename the variable if needed. @@ -194,12 +195,19 @@ Global variables and user defined functions must be prefixed with "g:", also at the script level. > vim9script let script_local = 'text' - let g:global = 'value' + g:global = 'value' let Funcref = g:ThatFunction Since "&opt = value" is now assigning a value to option "opt", ":&" cannot be used to repeat a `:substitute` command. + *E1092* +Declaring more than one variable at a time, using the unpack notation, is +currently not supported: > + let [v1, v2] = GetValues() # Error! +That is because the type needs to be inferred from the list item type, which +isn't that easy. + Omitting :call and :eval ~ @@ -209,15 +217,15 @@ Using `:call` is still possible, but this is discouraged. A method call without `eval` is possible, so long as the start is an identifier or can't be an Ex command. It does NOT work for string constants: > - myList->add(123) " works - g:myList->add(123) " works - [1, 2, 3]->Process() " works - #{a: 1, b: 2}->Process() " works - {'a': 1, 'b': 2}->Process() " works - "foobar"->Process() " does NOT work - ("foobar")->Process() " works - 'foobar'->Process() " does NOT work - ('foobar')->Process() " works + myList->add(123) # works + g:myList->add(123) # works + [1, 2, 3]->Process() # works + #{a: 1, b: 2}->Process() # works + {'a': 1, 'b': 2}->Process() # works + "foobar"->Process() # does NOT work + ("foobar")->Process() # works + 'foobar'->Process() # does NOT work + ('foobar')->Process() # works In case there is ambiguity between a function name and an Ex command, use ":" to make clear you want to use the Ex command. For example, there is both the @@ -277,10 +285,14 @@ possible just before or after the operator. For example: > ? PosFunc(arg) : NegFunc(arg) +For a method call using "->" and a member using a dot, a line break is allowed +before it: > let result = GetBuilder() ->BuilderSetWidth(333) ->BuilderSetHeight(777) ->BuilderBuild() + let result = MyDict + .member < *E1050* To make it possible for the operator at the start of the line to be @@ -486,19 +498,20 @@ THIS IS STILL UNDER DEVELOPMENT - ANYTHING CAN BREAK - ANYTHING CAN CHANGE When the caller omits an argument the {value} is used. The function will be compiled into instructions when - called, or when `:defcompile` is used. Syntax and - type errors will be produced at that time. + called, or when `:disassemble` or `:defcompile` is + used. Syntax and type errors will be produced at that + time. - NOTE: It is possible to nest `:def` inside another - `:def`, but it is not possible to nest `:def` inside - `:function`, for backwards compatibility. + It is possible to nest `:def` inside another `:def` or + `:function` up to about 50 levels deep. [!] is used as with `:function`. Note that in Vim9 script script-local functions cannot be deleted or redefined later in the same script. *:enddef* -:enddef End of a function defined with `:def`. +:enddef End of a function defined with `:def`. It should be on + a line by its own. If the script the function is defined in is Vim9 script, then script-local @@ -559,7 +572,7 @@ Not supported yet: tuple<a: {type}, b: {type}, ...> These types can be used in declarations, but no value will have this type: - {type}|{type} + {type}|{type} {not implemented yet} void any @@ -661,19 +674,15 @@ The original value of 'cpoptions' is restored at the end of the script. Export ~ *:export* *:exp* -Exporting one item can be written as: > +Exporting an item can be written as: > export const EXPORTED_CONST = 1234 export let someValue = ... export def MyFunc() ... export class MyClass ... As this suggests, only constants, variables, `:def` functions and classes can -be exported. +be exported. {classes are not implemented yet} -Alternatively, an export statement can be used to export several already -defined (otherwise script-local) items: > - export {EXPORTED_CONST, someValue, MyFunc, MyClass} -< *E1042* `:export` can only be used in Vim9 script, at the script level. diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim index 8c3f211da..f9d31cbec 100644 --- a/runtime/ftplugin/cpp.vim +++ b/runtime/ftplugin/cpp.vim @@ -1,12 +1,17 @@ " Vim filetype plugin file " Language: C++ " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2001 Jan 15 +" Last Change: 2020 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") finish endif -" Behaves just like C +" Behaves mostly just like C runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim + +" C++ uses templates with <things> +" Disabled, because it gives an error for typing an unmatched ">". +" set matchpairs+=<:> +" let b:undo_ftplugin ..= ' | setl matchpairs<' diff --git a/runtime/ftplugin/diff.vim b/runtime/ftplugin/diff.vim index 3fe1b84a0..046429047 100644 --- a/runtime/ftplugin/diff.vim +++ b/runtime/ftplugin/diff.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Diff " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2005 Jul 27 +" Last Change: 2020 Jul 18 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -13,3 +13,6 @@ let b:undo_ftplugin = "setl modeline<" " Don't use modelines in a diff, they apply to the diffed file setlocal nomodeline + +" If there are comments they start with # +let &commentstring = "# %s" diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index b2db4ab9f..b2d571093 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2020 Jul 06 +" Last Change: 2020 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -83,7 +83,7 @@ endif if exists("loaded_matchit") let b:match_ignorecase = 0 let b:match_words = - \ '\<\%(fu\%[nction]\|def\)\>:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . + \ '\<\%(fu\%[nction]\|def\)\>[^(]:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . \ '{:},' . diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim index b0c0a3916..380994338 100644 --- a/runtime/indent/vim.vim +++ b/runtime/indent/vim.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Vim script " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Oct 31 +" Last Change: 2020 Jul 19 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -11,6 +11,7 @@ let b:did_indent = 1 setlocal indentexpr=GetVimIndent() setlocal indentkeys+==end,=},=else,=cat,=fina,=END,0\\,0=\"\\\ +setlocal indentkeys-=0# let b:undo_indent = "setl indentkeys< indentexpr<" diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index ace012278..6680b48cc 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 Jun 12 +" Last Change: 2020 Jul 12 " " WORK IN PROGRESS - Only the basics work " Note: On MS-Windows you need a recent version of gdb. The one included with diff --git a/runtime/syntax/aidl.vim b/runtime/syntax/aidl.vim new file mode 100644 index 000000000..1947ab97d --- /dev/null +++ b/runtime/syntax/aidl.vim @@ -0,0 +1,23 @@ +" Vim syntax file +" Language: aidl (Android Interface Definition Language) +" https://developer.android.com/guide/components/aidl +" Maintainer: Dominique Pelle <dominique.pelle@tomtom.com> +" LastChange: 2020/07/25 + +" Quit when a syntax file was already loaded. +if exists("b:current_syntax") + finish +endif + +source <sfile>:p:h/java.vim + +syn keyword aidlParamDir in out inout +syn keyword aidlKeyword oneway parcelable + +" Needed for the 'in', 'out', 'inout' keywords to be highlighted. +syn cluster javaTop add=aidlParamDir + +hi def link aidlParamDir StorageClass +hi def link aidlKeyword Keyword + +let b:current_syntax = "aidl" diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index b3a8f96b6..ec0f7b99b 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> -" Last Change: Jun 07, 2020 -" Version: 118 +" Last Change: Jun 29, 2020 +" Version: 119 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " " Notes: {{{1 @@ -147,6 +147,11 @@ if exists("g:tex_nospell") && g:tex_nospell else let s:tex_nospell = 0 endif +if exists("g:tex_matchcheck") + let s:tex_matchcheck= g:tex_matchcheck +else + let s:tex_matchcheck= '[({[]' +endif if exists("g:tex_excludematcher") let s:tex_excludematcher= g:tex_excludematcher else @@ -205,27 +210,41 @@ if !exists("g:tex_no_math") endif endif -" Try to flag {} and () mismatches: {{{1 +" Try to flag {}, [], and () mismatches: {{{1 if s:tex_fast =~# 'm' if !s:tex_no_error - syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup,texError - syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup,texError,@NoSpell - syn region texMatcherNM matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchNMGroup,texError - syn region texMatcherNM matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchNMGroup,texError,@NoSpell + if s:tex_matchcheck =~ '{' + syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup,texError + syn region texMatcherNM matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchNMGroup,texError + endif + if s:tex_matchcheck =~ '\[' + syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup,texError,@NoSpell + syn region texMatcherNM matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchNMGroup,texError,@NoSpell + endif else - syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup - syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup - syn region texMatcherNM matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchNMGroup - syn region texMatcherNM matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchNMGroup + if s:tex_matchcheck =~ '{' + syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup + syn region texMatcherNM matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchNMGroup + endif + if s:tex_matchcheck =~ '\[' + syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup + syn region texMatcherNM matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchNMGroup + endif endif - if !s:tex_nospell - syn region texParen start="(" end=")" transparent contains=@texMatchGroup,@Spell - else - syn region texParen start="(" end=")" transparent contains=@texMatchGroup + if s:tex_matchcheck =~ '(' + if !s:tex_nospell + syn region texParen start="(" end=")" transparent contains=@texMatchGroup,@Spell + else + syn region texParen start="(" end=")" transparent contains=@texMatchGroup + endif endif endif if !s:tex_no_error - syn match texError "[}\])]" + if s:tex_matchcheck =~ '(' + syn match texError "[}\]]" + else + syn match texError "[}\])]" + endif endif if s:tex_fast =~# 'M' if !exists("g:tex_no_math") @@ -756,7 +775,7 @@ if has("conceal") && &enc == 'utf-8' \ ['ldots' , '…'], \ ['le' , '≤'], \ ['left|' , '|'], - \ ['left\|' , '‖'], + \ ['left\\|' , '‖'], \ ['left(' , '('], \ ['left\[' , '['], \ ['left\\{' , '{'], diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index d01cc40bb..9b20392fa 100644 --- 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 <NdrOchipS@PcampbellAfamily.Mbiz> -" Last Change: Jun 01, 20200 -" Version: 8.0-37 +" Last Change: July 15, 2020 +" Version: 8.0-41 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " Automatically generated keyword lists: {{{1 @@ -29,14 +29,14 @@ syn match vimCommand contained "\<z[-+^.=]\=\>" syn keyword vimStdPlugin contained Arguments Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns " vimOptions are caught only when contained in a vimSet {{{2 -syn keyword vimOption contained acd ambw arshape background ballooneval bex bl brk buftype cf cinkeys cmdwinheight com completeslash cpoptions cscoperelative csre cursorcolumn delcombine digraph eadirection emo equalprg expandtab fdls fex fileignorecase fml foldlevel formatexpr gcr go guifontset helpheight history hlsearch imaf ims includeexpr infercase iskeyword keywordprg laststatus lispwords lrm magic maxfuncdepth menuitems mm modifiable mousemodel mzq numberwidth opfunc patchexpr pfn pp printfont pumwidth pythonthreehome re restorescreen ro rulerformat scl scs sft shellredir shiftwidth showmatch signcolumn smarttab sp spf srr startofline suffixes switchbuf ta tagfunc tbi term termwintype tgc titlelen toolbariconsize ttimeout ttymouse twt undofile varsofttabstop verbosefile viminfofile wak weirdinvert wig wildoptions winheight wm wrapscan -syn keyword vimOption contained ai anti autochdir backspace balloonevalterm bexpr bo browsedir casemap cfu cino cmp comments concealcursor cpp cscopetag cst cursorline dex dip eb emoji errorbells exrc fdm ff filetype fmr foldlevelstart formatlistpat gd gp guifontwide helplang hk ic imak imsearch incsearch insertmode isp km lazyredraw list ls makeef maxmapdepth mfd mmd modified mouses mzquantum nuw osfiletype patchmode ph preserveindent printheader pvh pyx readonly revins rop runtimepath scr sect sh shellslash shm showmode siso smc spc spl ss statusline suffixesadd sws tabline taglength tbidi termbidi terse tgst titleold top ttimeoutlen ttyscroll tx undolevels vartabstop vfile virtualedit warn wfh wildchar wim winminheight wmh write -syn keyword vimOption contained akm antialias autoindent backup balloonexpr bg bomb bs cb ch cinoptions cms commentstring conceallevel cpt cscopetagorder csto cursorlineopt dg dir ed enc errorfile fcl fdn ffs fillchars fo foldmarker formatoptions gdefault grepformat guiheadroom hf hkmap icon imc imsf inde is isprint kmp lbr listchars lsp makeencoding maxmem mh mmp more mouseshape mzschemedll odev pa path pheader previewheight printmbcharset pvp pyxversion redrawtime ri rs sb scroll sections shcf shelltemp shortmess showtabline sj smd spell splitbelow ssl stl sw sxe tabpagemax tagrelative tbis termencoding textauto thesaurus titlestring tpm ttm ttytype uc undoreload vb vi visualbell wb wfw wildcharm winaltkeys winminwidth wmnu writeany -syn keyword vimOption contained al ar autoread backupcopy bdir bh breakat bsdir cc charconvert cinw co compatible confirm crb cscopeverbose csverb cwh dict directory edcompatible encoding errorformat fcs fdo fic fixendofline foldclose foldmethod formatprg gfm grepprg guioptions hh hkmapp iconstring imcmdline imst indentexpr isf joinspaces kp lcs lm luadll makeprg maxmempattern mis mmt mouse mouset mzschemegcdll oft packpath pdev pi previewpopup printmbfont pvw qe regexpengine rightleft rtp sbo scrollbind secure shell shelltype shortname shq slm sn spellcapcheck splitright ssop stmp swapfile sxq tabstop tags tbs termguicolors textmode tildeop tl tr tty tw udf updatecount vbs viewdir vop wc wh wildignore wincolor winptydll wmw writebackup -syn keyword vimOption contained aleph arab autowrite backupdir bdlay bin breakindent bsk ccv ci cinwords cocu complete copyindent cryptmethod csl cuc debug dictionary display ef endofline esckeys fdc fdt fileencoding fixeol foldcolumn foldminlines fp gfn gtl guipty hi hkp ignorecase imd imstatusfunc indentkeys isfname js langmap linebreak lmap lw mat maxmemtot mkspellmem mod mousef mousetime nf ofu para penc pm previewwindow printoptions pw qftf relativenumber rightleftcmd ru sbr scrollfocus sel shellcmdflag shellxescape showbreak si sm so spellfile spr st sts swapsync syn tag tagstack tc termwinkey textwidth timeout tm ts ttybuiltin twk udir updatetime vdir viewoptions vsts wcm whichwrap wildignorecase window winwidth wop writedelay -syn keyword vimOption contained allowrevins arabic autowriteall backupext belloff binary breakindentopt bt cd cin clipboard cole completefunc cot cscopepathcomp cspc cul deco diff dy efm eol et fde fen fileencodings fk foldenable foldnestmax fs gfs gtt guitablabel hid hl im imdisable imstyle indk isi key langmenu lines lnr lz matchpairs mco ml modeline mousefocus mp nrformats omnifunc paragraphs perldll pmbcs printdevice prompt pythondll quickfixtextfunc remap rl rubydll sc scrolljump selection shellpipe shellxquote showcmd sidescroll smartcase softtabstop spelllang sps sta su swb synmaxcol tagbsearch tal tcldll termwinscroll tf timeoutlen to tsl ttyfast tws ul ur ve vif vts wcr wi wildmenu winfixheight wiv wrap ws -syn keyword vimOption contained altkeymap arabicshape aw backupskip beval bk bri bufhidden cdpath cindent cm colorcolumn completeopt cp cscopeprg csprg culopt def diffexpr ea ei ep eventignore fdi fenc fileformat fkmap foldexpr foldopen fsync gfw guicursor guitabtooltip hidden hlg imactivatefunc imi inc inex isident keymap langnoremap linespace loadplugins ma matchtime mef mle modelineexpr mousehide mps nu opendevice paste pex pmbfn printencoding pt pythonhome quoteescape renderoptions rlc ruf scb scrolloff selectmode shellquote shiftround showfulltag sidescrolloff smartindent sol spellsuggest sr stal sua swf syntax tagcase tb tenc termwinsize tfu title toolbar tsr ttym twsl undodir ut verbose viminfo wa wd wic wildmode winfixwidth wiw wrapmargin ww -syn keyword vimOption contained ambiwidth ari awa balloondelay bevalterm bkc briopt buflisted cedit cink cmdheight columns completepopup cpo cscopequickfix csqf cursorbind define diffopt ead ek equalalways ex fdl fencs fileformats flp foldignore foldtext ft ghr guifont helpfile highlight hls imactivatekey iminsert include inf isk keymodel langremap lisp lpl macatsui maxcombine menc mls modelines mousem msm number operatorfunc pastetoggle pexpr popt printexpr pumheight pythonthreedll rdt report rnu ruler scf scrollopt sessionoptions +syn keyword vimOption contained acd ambw arshape background ballooneval bex bl brk buftype cf cinkeys cmdwinheight com completeslash cpoptions cscoperelative csre cursorcolumn delcombine digraph eadirection emo equalprg expandtab fdls fex fileignorecase fml foldlevel formatexpr gcr go guifontset helpheight history hlsearch imaf ims includeexpr infercase iskeyword keywordprg laststatus lispwords lrm magic maxfuncdepth menuitems mm modifiable mousemodel mzq numberwidth opfunc patchexpr pfn pp printfont pumwidth pythonthreehome re restorescreen ro rulerformat scl scs sft shellslash shortmess showtabline sj smd spell spl srr startofline suffixes switchbuf ta tagfunc tbi term termwintype tgc titlelen toolbariconsize ttimeout ttymouse twt undofile varsofttabstop verbosefile viminfofile wak weirdinvert wig wildoptions winheight wm wrapscan +syn keyword vimOption contained ai anti autochdir backspace balloonevalterm bexpr bo browsedir casemap cfu cino cmp comments concealcursor cpp cscopetag cst cursorline dex dip eb emoji errorbells exrc fdm ff filetype fmr foldlevelstart formatlistpat gd gp guifontwide helplang hk ic imak imsearch incsearch insertmode isp km lazyredraw list ls makeef maxmapdepth mfd mmd modified mouses mzquantum nuw osfiletype patchmode ph preserveindent printheader pvh pyx readonly revins rop runtimepath scr sect sh shelltemp shortname shq slm sn spellcapcheck splitbelow ss statusline suffixesadd sws tabline taglength tbidi termbidi terse tgst titleold top ttimeoutlen ttyscroll tx undolevels vartabstop vfile virtualedit warn wfh wildchar wim winminheight wmh write +syn keyword vimOption contained akm antialias autoindent backup balloonexpr bg bomb bs cb ch cinoptions cms commentstring conceallevel cpt cscopetagorder csto cursorlineopt dg dir ed enc errorfile fcl fdn ffs fillchars fo foldmarker formatoptions gdefault grepformat guiheadroom hf hkmap icon imc imsf inde is isprint kmp lbr listchars lsp makeencoding maxmem mh mmp more mouseshape mzschemedll odev pa path pheader previewheight printmbcharset pvp pyxversion redrawtime ri rs sb scroll sections shcf shelltype showbreak si sm so spellfile splitright ssl stl sw sxe tabpagemax tagrelative tbis termencoding textauto thesaurus titlestring tpm ttm ttytype uc undoreload vb vi visualbell wb wfw wildcharm winaltkeys winminwidth wmnu writeany +syn keyword vimOption contained al ar autoread backupcopy bdir bh breakat bsdir cc charconvert cinw co compatible confirm crb cscopeverbose csverb cwh dict directory edcompatible encoding errorformat fcs fdo fic fixendofline foldclose foldmethod formatprg gfm grepprg guioptions hh hkmapp iconstring imcmdline imst indentexpr isf joinspaces kp lcs lm luadll makeprg maxmempattern mis mmt mouse mouset mzschemegcdll oft packpath pdev pi previewpopup printmbfont pvw qe regexpengine rightleft rtp sbo scrollbind secure shell shellxescape showcmd sidescroll smartcase softtabstop spelllang spo ssop stmp swapfile sxq tabstop tags tbs termguicolors textmode tildeop tl tr tty tw udf updatecount vbs viewdir vop wc wh wildignore wincolor winptydll wmw writebackup +syn keyword vimOption contained aleph arab autowrite backupdir bdlay bin breakindent bsk ccv ci cinwords cocu complete copyindent cryptmethod csl cuc debug dictionary display ef endofline esckeys fdc fdt fileencoding fixeol foldcolumn foldminlines fp gfn gtl guipty hi hkp ignorecase imd imstatusfunc indentkeys isfname js langmap linebreak lmap lw mat maxmemtot mkspellmem mod mousef mousetime nf ofu para penc pm previewwindow printoptions pw qftf relativenumber rightleftcmd ru sbr scrollfocus sel shellcmdflag shellxquote showfulltag sidescrolloff smartindent sol spelloptions spr st sts swapsync syn tag tagstack tc termwinkey textwidth timeout tm ts ttybuiltin twk udir updatetime vdir viewoptions vsts wcm whichwrap wildignorecase window winwidth wop writedelay +syn keyword vimOption contained allowrevins arabic autowriteall backupext belloff binary breakindentopt bt cd cin clipboard cole completefunc cot cscopepathcomp cspc cul deco diff dy efm eol et fde fen fileencodings fk foldenable foldnestmax fs gfs gtt guitablabel hid hl im imdisable imstyle indk isi key langmenu lines lnr lz matchpairs mco ml modeline mousefocus mp nrformats omnifunc paragraphs perldll pmbcs printdevice prompt pythondll quickfixtextfunc remap rl rubydll sc scrolljump selection shellpipe shiftround showmatch signcolumn smarttab sp spellsuggest sps sta su swb synmaxcol tagbsearch tal tcldll termwinscroll tf timeoutlen to tsl ttyfast tws ul ur ve vif vts wcr wi wildmenu winfixheight wiv wrap ws +syn keyword vimOption contained altkeymap arabicshape aw backupskip beval bk bri bufhidden cdpath cindent cm colorcolumn completeopt cp cscopeprg csprg culopt def diffexpr ea ei ep eventignore fdi fenc fileformat fkmap foldexpr foldopen fsync gfw guicursor guitabtooltip hidden hlg imactivatefunc imi inc inex isident keymap langnoremap linespace loadplugins ma matchtime mef mle modelineexpr mousehide mps nu opendevice paste pex pmbfn printencoding pt pythonhome quoteescape renderoptions rlc ruf scb scrolloff selectmode shellquote shiftwidth showmode siso smc spc spf sr stal sua swf syntax tagcase tb tenc termwinsize tfu title toolbar tsr ttym twsl undodir ut verbose viminfo wa wd wic wildmode winfixwidth wiw wrapmargin ww +syn keyword vimOption contained ambiwidth ari awa balloondelay bevalterm bkc briopt buflisted cedit cink cmdheight columns completepopup cpo cscopequickfix csqf cursorbind define diffopt ead ek equalalways ex fdl fencs fileformats flp foldignore foldtext ft ghr guifont helpfile highlight hls imactivatekey iminsert include inf isk keymodel langremap lisp lpl macatsui maxcombine menc mls modelines mousem msm number operatorfunc pastetoggle pexpr popt printexpr pumheight pythonthreedll rdt report rnu ruler scf scrollopt sessionoptions shellredir shm " vimOptions: These are the turn-off setting variants {{{2 syn keyword vimOption contained noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobevalterm nobk nobreakindent nocf nocindent nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noed noemo noeol noesckeys noexpandtab nofic nofixeol nofoldenable nogd nohid nohkmap nohls noicon noimc noimdisable noinfercase nojoinspaces nolangremap nolinebreak nolnr nolrm nomacatsui noml nomod nomodelineexpr nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscrollbind noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup @@ -66,8 +66,8 @@ syn keyword vimErrSetting contained bioskey biosk conskey consk autoprint beauti " AutoCmd Events {{{2 syn case ignore -syn keyword vimAutoEvent contained BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew -syn keyword vimAutoEvent contained BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre +syn keyword vimAutoEvent contained BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew +syn keyword vimAutoEvent contained BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre BufWinEnter " Highlight commonly used Groupnames {{{2 syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo @@ -78,11 +78,11 @@ syn match vimHLGroup contained "Conceal" syn case match " Function Names {{{2 -syn keyword vimFuncName contained abs appendbufline asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabwinvar getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchaddpos matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower trunc uniq wildmenumode win_execute win_gotoid winlayout winrestview winwidth -syn keyword vimFuncName contained acos argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettagstack getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matcharg matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper type values winbufnr win_findbuf winheight winline winsaveview wordcount -syn keyword vimFuncName contained add argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getregtype getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapset matchdelete max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undofile virtcol wincol win_getid win_id2tabwin winnr win_screenpos writefile -syn keyword vimFuncName contained and arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid gettabinfo getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval match matchend menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim undotree visualmode windowsversion win_gettype win_id2win winrestcmd win_splitmove xor -syn keyword vimFuncName contained append argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map matchadd matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall +syn keyword vimFuncName contained abs appendbufline asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabinfo getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval match matchend menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undotree wildmenumode win_execute win_gotoid winlayout winrestview winwidth +syn keyword vimFuncName contained acos argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable flatten fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map matchadd matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim uniq winbufnr win_findbuf winheight winline winsaveview wordcount +syn keyword vimFuncName contained add argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettabwinvar getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchaddpos matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc values wincol win_getid win_id2tabwin winnr win_screenpos writefile +syn keyword vimFuncName contained and arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getreginfo gettagstack getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matcharg matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower type virtcol windowsversion win_gettype win_id2win winrestcmd win_splitmove xor +syn keyword vimFuncName contained append argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid getregtype getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapset matchdelete max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper undofile visualmode "--- syntax here and above generated by mkvimvim --- " Special Vim Highlighting (not automatic) {{{1 @@ -295,6 +295,7 @@ syn match vimComment +\<endif\s\+".*$+lc=5 contains=@vimCommentGroup,vimCommentS syn match vimComment +\<else\s\+".*$+lc=4 contains=@vimCommentGroup,vimCommentString syn region vimCommentString contained oneline start='\S\s\+"'ms=e end='"' " Vim9 comments - TODO: might be highlighted while they don't work +syn match vim9Comment excludenl +^#[^{].*$+ contains=@vimCommentGroup,vimCommentString syn match vim9Comment excludenl +\s#[^{].*$+lc=1 contains=@vimCommentGroup,vimCommentString syn match vim9Comment +\<endif\s\+#[^{].*$+lc=5 contains=@vimCommentGroup,vimCommentString syn match vim9Comment +\<else\s\+#[^{].*$+lc=4 contains=@vimCommentGroup,vimCommentString @@ -453,6 +454,9 @@ 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.]*\>\|\<if\>" contains=vimNotation +" User Command Highlighting: {{{2 +syn match vimUsrCmd '^\s*\zs\u\w*.*$' + " Errors And Warnings: {{{2 " ==================== if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror") @@ -598,7 +602,7 @@ syn match vimHiGuiFontname contained "'[a-zA-Z\-* ]\+'" syn match vimHiGuiRgb contained "#\x\{6}" " Highlighting: hi group key=arg ... {{{2 -syn cluster vimHiCluster contains=vimGroup,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation +syn cluster vimHiCluster contains=vimGroup,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiCtermul,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation syn region vimHiKeyList contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||" contains=@vimHiCluster if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror") syn match vimHiKeyError contained "\i\+="he=e-1 @@ -607,6 +611,7 @@ syn match vimHiTerm contained "\cterm="he=e-1 nextgroup=vimHiAttribList syn match vimHiStartStop contained "\c\(start\|stop\)="he=e-1 nextgroup=vimHiTermcap,vimOption syn match vimHiCTerm contained "\ccterm="he=e-1 nextgroup=vimHiAttribList syn match vimHiCtermFgBg contained "\ccterm[fb]g="he=e-1 nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError +syn match vimHiCtermul contained "\cctermul="he=e-1 nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError syn match vimHiGui contained "\cgui="he=e-1 nextgroup=vimHiAttribList syn match vimHiGuiFont contained "\cfont="he=e-1 nextgroup=vimHiFontname syn match vimHiGuiFgBg contained "\cgui\%([fb]g\|sp\)="he=e-1 nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib @@ -629,7 +634,7 @@ syn match vimCtrlChar "[- - ]" " Beginners - Patterns that involve ^ {{{2 " ========= syn match vimLineComment +^[ \t:]*".*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle -syn match vim9LineComment +^[ \t:]\+#.*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle +syn match vim9LineComment +^[ \t:]*#.*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle syn match vimCommentTitle '"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1 contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup syn match vimContinue "^\s*\\" syn region vimString start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue @@ -877,6 +882,7 @@ if !exists("skip_vim_syntax_inits") hi def link vimError Error hi def link vimFBVar vimVar hi def link vimFgBgAttrib vimHiAttrib + hi def link vimHiCtermul vimHiTerm hi def link vimFold Folded hi def link vimFTCmd vimCommand hi def link vimFTOption vimSynType diff --git a/runtime/tutor/tutor.eo b/runtime/tutor/tutor.eo index 11a0b9d00..b11d145e9 100644 --- a/runtime/tutor/tutor.eo +++ b/runtime/tutor/tutor.eo @@ -7,7 +7,7 @@ fasonita por priskribi sufiajn komandojn, por ke vi kapablu uzi Vim kun sufia facileco. - La tempo bezonata por plenumi la kurson estas 25-30 minutoj, kaj dependas + La tempo bezonata por plenumi la kurson estas 30 minutoj, kaj dependas de kiom da tempo estas uzata por eksperimenti. ATENTU: @@ -100,7 +100,7 @@ RIMARKO: Trairante la instruilon, ne provu memori, lernu per la uzo. 1. Movu la kursoron al la unua suba linio markita per --->. 2. Por igi la unuan linion sama kiel la dua, movu la kursoron sur la unuan - signon post kie la teksto estas enmetenda. + signon anta kie la teksto estas enmetenda. 3. Premu i kaj tajpu la bezonatajn aldonojn. @@ -200,7 +200,7 @@ Nun darigu al la leciono 2. 1. Premu <ESK> por certigi, ke vi estas en normala reimo. - 2. Movu la kursoron al la linio markita per --->. + 2. Movu la kursoron al la suba linio markita per --->. 3. Movu la kursoron al la komenco de vorto, kiu forviendas. @@ -225,7 +225,7 @@ Nun darigu al la leciono 2. 1. Premu <ESK> por certigi, ke vi estas en normala reimo. - 2. Movu la kursoron sur la suban linion markita per --->. + 2. Movu la kursoron al la suba linio markita per --->. 3. Movu la kursoron e la fino de la usta linio (POST la unua . ). @@ -296,10 +296,10 @@ RIMARKO: Premo de nur la movo en Normala reimo sen operatoro movos 1. Movu la kursoron e la unua MAJUSKLA vorto en la linio markita per --->. - 2. Tajpu d2w por forvii la du MAJUSKLAJN vortojn + 2. Tajpu d2w por forvii la du MAJUSKLAJN vortojn. 3. Ripetu paojn 1 is 2 per malsama nombro por forvii la sinsekvajn - MAJUSKLAJN vortojn per unu komando + MAJUSKLAJN vortojn per unu komando. ---> Tiu AB CDE linio FGHI JK LMN OP de vortoj estas Q RS TUV purigita. @@ -379,7 +379,7 @@ RIMARKO: Premo de nur la movo en Normala reimo sen operatoro movos ** Tajpu p por meti tekston forviitan antae post la kursoro. ** - 1. Movu la kursoron e la unua ---> suba linio. + 1. Movu la kursoron e la unua suba linio markita per --->. 2. Tajpu dd por forvii la linion kaj konservi in ene de reistro de Vim. @@ -652,7 +652,7 @@ RIMARKO: Se vi volus eliri el Vim kaj restartigi in denove per vim TESTO, la dosiero estus precize same kiel kopio de la instruilo kiam vi konservis in. - 5. Nun forviu la dosieron tajpante (WINDOWS): :!del TESTO + 5. Nun forviu la dosieron tajpante (VINDOZO): :!del TESTO a (UNIKSO): :!rm TESTO @@ -713,7 +713,7 @@ RIMARKO: Vi nun povas legi la eliron de ekstera komando. Ekzemple, 1. :!komando plenumas eksteran komandon. Iuj utilaj ekzemploj estas: - (WINDOWS) (UNIKSO) + (VINDOZO) (UNIKSO) :!dir :!ls - listigas dosierujon :!del DOSIERNOMO :!rm DOSIERNOMO - forvias la dosieron DOSIERNOMO @@ -808,7 +808,7 @@ RIMARKO: Anstataiga reimo estas same kiel Enmeta reimo, sed iu signo ** Uzu la y operatoron por kopii tekston, kaj p por alglui in ** - 1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)". + 1. Iru al la suba linio markita per ---> kaj poziciu la kursoron post "a)". 2. Komencu la Viduman reimon per v kaj movu la kursoron tuj anta "unua". @@ -914,7 +914,7 @@ RIMARKO: Se vi deziras ignori usklecon por nur unu sera komando, uzu \c 1. Ekredaktu la dosieron "vimrc". Tio dependas de via sistemo: :e ~/.vimrc por Unikso - :e $VIM/_vimrc por Windows + :e $VIM/_vimrc por Vindozo 2. Nun legu la enhavon de la ekzempla "vimrc" :r $VIMRUNTIME/vimrc_example.vim @@ -945,7 +945,7 @@ RIMARKO: Se vi deziras ignori usklecon por nur unu sera komando, uzu \c 6. Nun aldonu spaceton kaj la komencon de ekzistanta nomo: :edit DOSI - 7. Premu <TAB>. Vim kompletigos la nomon (se i estas unika) + 7. Premu d<TAB>. Vim kompletigos la nomon (se i estas unika) RIMARKO: Kompletigo funkcias por multaj komandoj. Nur provu premi CTRL-D kaj <TAB>. Estas aparte utila por :help . @@ -986,6 +986,6 @@ RIMARKO: Kompletigo funkcias por multaj komandoj. Nur provu premi CTRL-D kaj Esperantigita fare de Dominique Pell, 2008-04-01 Retpoto: dominique.pelle@gmail.com - Lasta ano: 2018-12-02 + Lasta ano: 2020-07-19 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/runtime/tutor/tutor.eo.utf-8 b/runtime/tutor/tutor.eo.utf-8 index 1b3873c13..a11c5554b 100644 --- a/runtime/tutor/tutor.eo.utf-8 +++ b/runtime/tutor/tutor.eo.utf-8 @@ -7,7 +7,7 @@ fasonita por priskribi sufiĉajn komandojn, por ke vi kapablu uzi Vim kun sufiĉa facileco. - La tempo bezonata por plenumi la kurson estas 25-30 minutoj, kaj dependas + La tempo bezonata por plenumi la kurson estas 30 minutoj, kaj dependas de kiom da tempo estas uzata por eksperimenti. ATENTU: @@ -100,7 +100,7 @@ RIMARKO: Trairante la instruilon, ne provu memori, lernu per la uzo. 1. Movu la kursoron al la unua suba linio markita per --->. 2. Por igi la unuan linion sama kiel la dua, movu la kursoron sur la unuan - signon post kie la teksto estas enmetenda. + signon antaŭ kie la teksto estas enmetenda. 3. Premu i kaj tajpu la bezonatajn aldonojn. @@ -200,7 +200,7 @@ Nun daŭrigu al la leciono 2. 1. Premu <ESK> por certigi, ke vi estas en normala reĝimo. - 2. Movu la kursoron al la linio markita per --->. + 2. Movu la kursoron al la suba linio markita per --->. 3. Movu la kursoron al la komenco de vorto, kiu forviŝendas. @@ -225,7 +225,7 @@ Nun daŭrigu al la leciono 2. 1. Premu <ESK> por certigi, ke vi estas en normala reĝimo. - 2. Movu la kursoron sur la suban linion markita per --->. + 2. Movu la kursoron al la suba linio markita per --->. 3. Movu la kursoron ĉe la fino de la ĝusta linio (POST la unua . ). @@ -296,10 +296,10 @@ RIMARKO: Premo de nur la movo en Normala reĝimo sen operatoro movos 1. Movu la kursoron ĉe la unua MAJUSKLA vorto en la linio markita per --->. - 2. Tajpu d2w por forviŝi la du MAJUSKLAJN vortojn + 2. Tajpu d2w por forviŝi la du MAJUSKLAJN vortojn. 3. Ripetu paŝojn 1 ĝis 2 per malsama nombro por forviŝi la sinsekvajn - MAJUSKLAJN vortojn per unu komando + MAJUSKLAJN vortojn per unu komando. ---> Tiu AB CDE linio FGHI JK LMN OP de vortoj estas Q RS TUV purigita. @@ -379,7 +379,7 @@ RIMARKO: Premo de nur la movo en Normala reĝimo sen operatoro movos ** Tajpu p por meti tekston forviŝitan antaŭe post la kursoro. ** - 1. Movu la kursoron ĉe la unua ---> suba linio. + 1. Movu la kursoron ĉe la unua suba linio markita per --->. 2. Tajpu dd por forviŝi la linion kaj konservi ĝin ene de reĝistro de Vim. @@ -652,7 +652,7 @@ RIMARKO: Se vi volus eliri el Vim kaj restartigi ĝin denove per vim TESTO, la dosiero estus precize same kiel kopio de la instruilo kiam vi konservis ĝin. - 5. Nun forviŝu la dosieron tajpante (WINDOWS): :!del TESTO + 5. Nun forviŝu la dosieron tajpante (VINDOZO): :!del TESTO aŭ (UNIKSO): :!rm TESTO @@ -713,7 +713,7 @@ RIMARKO: Vi nun povas legi la eliron de ekstera komando. Ekzemple, 1. :!komando plenumas eksteran komandon. Iuj utilaj ekzemploj estas: - (WINDOWS) (UNIKSO) + (VINDOZO) (UNIKSO) :!dir :!ls - listigas dosierujon :!del DOSIERNOMO :!rm DOSIERNOMO - forviŝas la dosieron DOSIERNOMO @@ -808,7 +808,7 @@ RIMARKO: Anstataŭiga reĝimo estas same kiel Enmeta reĝimo, sed ĉiu signo ** Uzu la y operatoron por kopii tekston, kaj p por alglui ĝin ** - 1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)". + 1. Iru al la suba linio markita per ---> kaj poziciu la kursoron post "a)". 2. Komencu la Viduman reĝimon per v kaj movu la kursoron tuj antaŭ "unua". @@ -914,7 +914,7 @@ RIMARKO: Se vi deziras ignori usklecon por nur unu serĉa komando, uzu \c 1. Ekredaktu la dosieron "vimrc". Tio dependas de via sistemo: :e ~/.vimrc por Unikso - :e $VIM/_vimrc por Windows + :e $VIM/_vimrc por Vindozo 2. Nun legu la enhavon de la ekzempla "vimrc" :r $VIMRUNTIME/vimrc_example.vim @@ -945,7 +945,7 @@ RIMARKO: Se vi deziras ignori usklecon por nur unu serĉa komando, uzu \c 6. Nun aldonu spaceton kaj la komencon de ekzistanta nomo: :edit DOSI - 7. Premu <TAB>. Vim kompletigos la nomon (se ĝi estas unika) + 7. Premu d<TAB>. Vim kompletigos la nomon (se ĝi estas unika) RIMARKO: Kompletigo funkcias por multaj komandoj. Nur provu premi CTRL-D kaj <TAB>. Estas aparte utila por :help . @@ -986,6 +986,6 @@ RIMARKO: Kompletigo funkcias por multaj komandoj. Nur provu premi CTRL-D kaj Esperantigita fare de Dominique Pellé, 2008-04-01 Retpoŝto: dominique.pelle@gmail.com - Lasta ŝanĝo: 2018-12-02 + Lasta ŝanĝo: 2020-07-19 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |