From 0414a338687801c0ea4770d8288cf1f9e1dd83eb Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Aug 2019 06:44:48 +0200 Subject: vim-patch:61da1bfa6c6b Update runtime files. https://github.com/vim/vim/commit/61da1bfa6c6b19dd670671a318ce9f9e2acc784c --- runtime/doc/autocmd.txt | 2 +- runtime/doc/diff.txt | 2 +- runtime/doc/editing.txt | 2 +- runtime/doc/eval.txt | 2 +- runtime/doc/fold.txt | 2 +- runtime/doc/map.txt | 12 ++++++------ runtime/doc/motion.txt | 4 ++-- runtime/doc/quickfix.txt | 10 +++++----- runtime/doc/starting.txt | 2 +- runtime/doc/syntax.txt | 17 +++++++++-------- runtime/doc/tagsrch.txt | 2 +- runtime/doc/usr_06.txt | 3 +-- runtime/doc/various.txt | 2 +- runtime/doc/windows.txt | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 733a01e761..6343f6ef3d 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1351,7 +1351,7 @@ have changed autocommands, or when Vim has executed the wrong autocommands Note that the 'eventignore' option applies here too. Events listed in this option will not cause any commands to be executed. - *:do* *:doau* *:doautocmd* *E217* + *:do* *:doau* *:doaut* *:doautocmd* *E217* :do[autocmd] [] [group] {event} [fname] Apply the autocommands matching [fname] (default: current file name) for {event} to the current buffer. diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index ab002b4dcb..ae8039f7ca 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -175,7 +175,7 @@ hidden buffers. You can use ":hide" to close a window without unloading the buffer. If you don't want a buffer to remain used for the diff do ":set nodiff" before hiding it. - *:dif* *:diffupdate* + *:dif* *:diff* *:diffupdate* :dif[fupdate][!] Update the diff highlighting and folds. Vim attempts to keep the differences updated when you make changes to the diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index f4d3164dbc..f1887d557d 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -555,7 +555,7 @@ You can use the argument list with the following commands, and with the expression functions |argc()| and |argv()|. These all work on the argument list of the current window. - *:ar* *:args* + *:ar* *:arg* *:args* :ar[gs] Print the argument list, with the current file in square brackets. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index de303f6ccd..49c36d52b5 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -9750,7 +9750,7 @@ This does NOT work: > opposite of |:lockvar|. -:if {expr1} *:if* *:endif* *:en* *E171* *E579* *E580* +:if {expr1} *:if* *:end* *:endif* *:en* *E171* *E579* *E580* :en[dif] Execute the commands until the next matching ":else" or ":endif" if {expr1} evaluates to non-zero. diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index b7d92fb229..f2f6c70b0c 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -436,7 +436,7 @@ zk Move upwards to the end of the previous fold. A closed fold EXECUTING COMMANDS ON FOLDS ~ -:[range]foldd[oopen] {cmd} *:foldd* *:folddoopen* +:[range]foldd[oopen] {cmd} *:foldd* *:folddo* *:folddoopen* Execute {cmd} on all lines that are not in a closed fold. When [range] is given, only these lines are used. Each time {cmd} is executed the cursor is positioned on the diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index a2fdd821ff..80c49a0033 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -39,7 +39,7 @@ modes. :om[ap] {lhs} {rhs} |mapmode-o| *:om* *:omap* :map! {lhs} {rhs} |mapmode-ic| *:map!* :im[ap] {lhs} {rhs} |mapmode-i| *:im* *:imap* -:lm[ap] {lhs} {rhs} |mapmode-l| *:lm* *:lmap* +:lm[ap] {lhs} {rhs} |mapmode-l| *:lm* *:lma* *:lmap* :cm[ap] {lhs} {rhs} |mapmode-c| *:cm* *:cmap* :tma[p] {lhs} {rhs} |mapmode-t| *:tma* *:tmap* Map the key sequence {lhs} to {rhs} for the modes @@ -52,12 +52,12 @@ modes. :nn[oremap] {lhs} {rhs} |mapmode-n| *:nn* *:nnoremap* :vn[oremap] {lhs} {rhs} |mapmode-v| *:vn* *:vnoremap* :xn[oremap] {lhs} {rhs} |mapmode-x| *:xn* *:xnoremap* -:snor[emap] {lhs} {rhs} |mapmode-s| *:snor* *:snoremap* +:snor[emap] {lhs} {rhs} |mapmode-s| *:snor* *:snore* *:snoremap* :ono[remap] {lhs} {rhs} |mapmode-o| *:ono* *:onoremap* :no[remap]! {lhs} {rhs} |mapmode-ic| *:no!* *:noremap!* -:ino[remap] {lhs} {rhs} |mapmode-i| *:ino* *:inoremap* +:ino[remap] {lhs} {rhs} |mapmode-i| *:ino* *:inor* *:inoremap* :ln[oremap] {lhs} {rhs} |mapmode-l| *:ln* *:lnoremap* -:cno[remap] {lhs} {rhs} |mapmode-c| *:cno* *:cnoremap* +:cno[remap] {lhs} {rhs} |mapmode-c| *:cno* *:cnor* *:cnoremap* :tno[remap] {lhs} {rhs} |mapmode-t| *:tno* *:tnoremap* Map the key sequence {lhs} to {rhs} for the modes where the map command applies. Disallow mapping of @@ -74,7 +74,7 @@ modes. :unm[ap]! {lhs} |mapmode-ic| *:unm!* *:unmap!* :iu[nmap] {lhs} |mapmode-i| *:iu* *:iunmap* :lu[nmap] {lhs} |mapmode-l| *:lu* *:lunmap* -:cu[nmap] {lhs} |mapmode-c| *:cu* *:cunmap* +:cu[nmap] {lhs} |mapmode-c| *:cu* *:cun* *:cunmap* :tunma[p] {lhs} |mapmode-t| *:tunma* *:tunmap* Remove the mapping of {lhs} for the modes where the map command applies. The mapping may remain defined @@ -972,7 +972,7 @@ See |:verbose-cmd| for more information. :norea[bbrev] [] [] [lhs] [rhs] same as ":ab", but no remapping for this {rhs} - *:ca* *:cabbrev* + *:ca* *:cab* *:cabbrev* :ca[bbrev] [] [] [lhs] [rhs] same as ":ab", but for Command-line mode only. diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 4b2e083d5b..97c7d1cc43 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -924,7 +924,7 @@ These commands are not marks themselves, but jump to a mark: [` [count] times to lowercase mark before the cursor. -:loc[kmarks] {command} *:loc* *:lockmarks* +:loc[kmarks] {command} *:loc* *:lock* *:lockmarks* Execute {command} without adjusting marks. This is useful when changing text in a way that the line count will be the same when the change has completed. @@ -950,7 +950,7 @@ These commands are not marks themselves, but jump to a mark: - folds - diffs -:kee[pmarks] {command} *:kee* *:keepmarks* +:kee[pmarks] {command} *:kee* *:keep* *:keepmarks* Currently only has effect for the filter command |:range!|: - When the number of lines after filtering is equal to diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index ca836fea67..69935be133 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -87,7 +87,7 @@ processing a quickfix or location list command, it will be aborted. :ll[!] [nr] Same as ":cc", except the location list for the current window is used instead of the quickfix list. - *:cn* *:cnext* *E553* + *:cn* *:cne* *:cnext* *E553* :[count]cn[ext][!] Display the [count] next error in the list that includes a file name. If there are no file names at all, go to the [count] next error. See |:cc| for @@ -177,7 +177,7 @@ processing a quickfix or location list command, it will be aborted. 'encoding' option, you can use the 'makeencoding' option to specify the encoding. - *:lf* *:lfile* + *:lf* *:lfi* *:lfile* :lf[ile][!] [errorfile] Same as ":cfile", except the location list for the current window is used instead of the quickfix list. You can not use the -q command-line option to set @@ -192,7 +192,7 @@ processing a quickfix or location list command, it will be aborted. option to specify the encoding. -:lg[etfile] [errorfile] *:lg* *:lgetfile* +:lg[etfile] [errorfile] *:lg* *:lge* *:lgetfile* Same as ":cgetfile", except the location list for the current window is used instead of the quickfix list. @@ -230,7 +230,7 @@ processing a quickfix or location list command, it will be aborted. the current window is used instead of the quickfix list. - *:cad* *:caddbuffer* + *:cad* *:cadd* *:caddbuffer* :cad[dbuffer] [bufnr] Read the error list from the current buffer and add the errors to the current quickfix list. If a quickfix list is not present, then a new list is @@ -277,7 +277,7 @@ processing a quickfix or location list command, it will be aborted. Example: > :g/mypattern/caddexpr expand("%") . ":" . line(".") . ":" . getline(".") < - *:lad* *:laddexpr* + *:lad* *:addd* *:laddexpr* :lad[dexpr] {expr} Same as ":caddexpr", except the location list for the current window is used instead of the quickfix list. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 6e68753292..389bc486f0 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -731,7 +731,7 @@ vimrc file. options to [file] (default ".exrc" in the current directory). - *:mkv* *:mkvimrc* + *:mkv* *:mkvi* *:mkvimrc* :mkv[imrc][!] [file] Like ":mkexrc", but the default is ".nvimrc" in the current directory. The ":version" command is also written to the file. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 208e8ea48d..b3edc4757d 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -5124,6 +5124,15 @@ load the syntax file. The command also deletes the "b:current_syntax" variable, since no syntax is loaded after this command. +To clean up specific syntax groups for the current buffer: > + :syntax clear {group-name} .. +This removes all patterns and keywords for {group-name}. + +To clean up specific syntax group lists for the current buffer: > + :syntax clear @{grouplist-name} .. +This sets {grouplist-name}'s contents to an empty list. + + *:syntax-off* *:syn-off* If you want to disable syntax highlighting for all buffers, you need to remove the autocommands that load the syntax files: > :syntax off @@ -5133,14 +5142,6 @@ What this command actually does, is executing the command > See the "nosyntax.vim" file for details. Note that for this to work $VIMRUNTIME must be valid. See |$VIMRUNTIME|. -To clean up specific syntax groups for the current buffer: > - :syntax clear {group-name} .. -This removes all patterns and keywords for {group-name}. - -To clean up specific syntax group lists for the current buffer: > - :syntax clear @{grouplist-name} .. -This sets {grouplist-name}'s contents to an empty list. - *:syntax-reset* *:syn-reset* If you have changed the colors and messed them up, use this command to get the defaults back: > diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 4890cf3848..f747e6a6fb 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -802,7 +802,7 @@ CTRL-W d Open a new window, with the cursor on the first (default: whole file). See |:search-args| for [/] and [!]. - *:che* *:checkpath* + *:che* *:chec* *:check* *:checkpath* :che[ckpath] List all the included files that could not be found. :che[ckpath]! List all the included files. diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index beffb92877..360f72ec63 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -193,13 +193,12 @@ too slow, you might want to disable syntax highlighting for a moment: > When editing another file (or the same one) the colors will come back. - *:syn-off* If you want to stop highlighting completely use: > :syntax off This will completely disable syntax highlighting and remove it immediately for -all buffers. +all buffers. See |:syntax-off| for more details. *:syn-manual* If you want syntax highlighting only for specific files, use this: > diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 0429341b6f..1287a38d93 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -283,7 +283,7 @@ g8 Print the hex values of the bytes used in the *:!!* :!! Repeat last ":!{cmd}". - *:ve* *:version* + *:ve* *:ver* *:version* :ve[rsion] Print editor version and build information. See also |feature-compile|. diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 00ba462c7f..0bad1c87d6 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -192,7 +192,7 @@ CTRL-W CTRL_N *CTRL-W_CTRL-N* :[N]sv[iew] [++opt] [+cmd] {file} *:sv* *:sview* *splitview* Same as ":split", but set 'readonly' option for this buffer. -:[N]sf[ind] [++opt] [+cmd] {file} *:sf* *:sfind* *splitfind* +:[N]sf[ind] [++opt] [+cmd] {file} *:sf* *:sfi* *:sfind* *splitfind* Same as ":split", but search for {file} in 'path' like in |:find|. Doesn't split if {file} is not found. @@ -1174,7 +1174,7 @@ list of buffers. |unlisted-buffer| Uses 'switchbuf'. Also see |+cmd|. -:br[ewind][!] [+cmd] *:br* *:brewind* +:br[ewind][!] [+cmd] *:br* *:bre* *:brewind* Go to first buffer in buffer list. If the buffer list is empty, go to the first unlisted buffer. See |:buffer-!| for [!]. -- cgit