diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-01 22:45:59 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-08-01 22:48:28 +0200 |
| commit | 2cdbbe50a4a695004adce50d7502869bb2410928 (patch) | |
| tree | b85ddd40c86b73c3bbf748c923b744a7a89e3716 /runtime/doc | |
| parent | 41fe644124140c4a303de4a5a84e28efec918274 (diff) | |
| download | rneovim-2cdbbe50a4a695004adce50d7502869bb2410928.tar.gz rneovim-2cdbbe50a4a695004adce50d7502869bb2410928.tar.bz2 rneovim-2cdbbe50a4a695004adce50d7502869bb2410928.zip | |
vim-patch:63b74a8362b1
Update runtime files.
https://github.com/vim/vim/commit/63b74a8362b14576b21d342dc424d0396ca8ea27
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/index.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/tagsrch.txt | 3 |
3 files changed, 15 insertions, 5 deletions
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 6b80ab1ac2..4cab36a3c8 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1028,10 +1028,11 @@ tag command action in Command-line editing mode ~ command-line from history. |c_CTRL-Q| CTRL-Q same as CTRL-V, unless it's used for terminal control flow -|c_CTRL-R| CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A} +|c_CTRL-R| CTRL-R {regname} insert the contents of a register or object under the cursor as if typed -|c_CTRL-R_CTRL-R| CTRL-R CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A} +|c_CTRL-R_CTRL-R| CTRL-R CTRL-R {regname} +|c_CTRL-R_CTRL-O| CTRL-R CTRL-O {regname} insert the contents of a register or object under the cursor literally CTRL-S (used for terminal control flow) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 707073d158..8881f12f47 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1810,7 +1810,15 @@ A jump table for the options with a short description can be found at |Q_op|. The default value is for C programs. For C++ this value would be useful, to include const type declarations: > ^\(#\s*define\|[a-z]*\s*const\s*[a-z]*\) +< You can also use "\ze" just before the name and continue the pattern + to check what is following. E.g. for Javascript, if a function is + defined with "func_name = function(args)": > + ^\s*\ze\i\+\s*=\s*function( +< If the function is defined with "func_name : function() {...": > + ^\s*\ze\i\+\s*[:]\s*(*function\s*( < When using the ":set" command, you need to double the backslashes! + To avoid that use `:let` with a single quote string: > + let &l:define = '^\s*\ze\k\+\s*=\s*function(' *'delcombine'* *'deco'* *'nodelcombine'* *'nodeco'* 'delcombine' 'deco' boolean (default off) @@ -5974,7 +5982,9 @@ A jump table for the options with a short description can be found at |Q_op|. pages. split If included, split the current window before loading a buffer for a |quickfix| command that display errors. - Otherwise: do not split, use current window. + Otherwise: do not split, use current window (when used + in the quickfix window: the previously used window or + split if there is no other window). vsplit Just like "split" but split vertically. newtab Like "split", but open a new tab page. Overrules "split" when both are present. diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index eec217769a..4890cf3848 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -523,8 +523,7 @@ only supported by new versions of ctags (such as Exuberant ctags). be any identifier. It cannot contain a <Tab>. {TAB} One <Tab> character. Note: previous versions allowed any white space here. This has been abandoned to allow spaces in - {tagfile}. It can be re-enabled by including the - |+tag_any_white| feature at compile time. *tag-any-white* + {tagfile}. {tagfile} The file that contains the definition of {tagname}. It can have an absolute or relative path. It may contain environment variables and wildcards (although the use of wildcards is |