diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-07-29 01:58:17 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-29 20:50:07 +0200 |
commit | 80dda6892612de8405744b549aa2c2578a82a1b5 (patch) | |
tree | 79e13d529763466e3191f95eb302430b050e38ab /runtime/doc | |
parent | f64486b6b6b70a05b357229f86b35ab25d92636e (diff) | |
download | rneovim-80dda6892612de8405744b549aa2c2578a82a1b5.tar.gz rneovim-80dda6892612de8405744b549aa2c2578a82a1b5.tar.bz2 rneovim-80dda6892612de8405744b549aa2c2578a82a1b5.zip |
vim-patch:ba3ff539303c
Update runtime files
https://github.com/vim/vim/commit/ba3ff539303c7bb6e46a6802dce3c7b2e55284e0
Diffstat (limited to 'runtime/doc')
-rw-r--r-- | runtime/doc/change.txt | 2 | ||||
-rw-r--r-- | runtime/doc/cmdline.txt | 1 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
-rw-r--r-- | runtime/doc/indent.txt | 5 | ||||
-rw-r--r-- | runtime/doc/quickfix.txt | 2 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 3 | ||||
-rw-r--r-- | runtime/doc/windows.txt | 4 |
7 files changed, 15 insertions, 8 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 912231bfcd..13af2b05ce 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -800,7 +800,7 @@ the |substitute()| function with the following exceptions: - magic is always set without regard to 'magic'. - A ~ inserts a tilde literally. - <CR> and \r inserts a carriage-return (CTRL-M). - - \<CR> does not have a special meaning. it's just one of \x. + - \<CR> does not have a special meaning. It's just one of \x. Examples: > :s/a\|b/xxx\0xxx/g modifies "a b" to "xxxaxxx xxxbxxx" diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 5f4f128329..119fd924f1 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -499,7 +499,6 @@ that see the '"' as part of their argument: :autocmd :bufdo :cexpr (and the like) - :call :cdo (and the like) :command :cscope (and the like) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 752e368925..70e6895a75 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -147,10 +147,10 @@ function() or funcref(). When calling the function the Dictionary and/or arguments will be passed to the function. Example: > let Cb = function('Callback', ['foo'], myDict) - call Cb() + call Cb('bar') This will invoke the function as if using: > - call myDict.Callback('foo') + call myDict.Callback('foo', 'bar') Note that binding a function to a Dictionary also happens when the function is a member of the Dictionary: > @@ -8819,7 +8819,7 @@ win_getid([{win} [, {tab}]]) *win_getid()* Get the |window-ID| for the specified window. When {win} is missing use the current window. With {win} this is the window number. The top window has - number 1. Use `win_getid(winnr())` for the current window. + number 1. Without {tab} use the current tab, otherwise the tab with number {tab}. The first tab has number one. Return zero if the window cannot be found. diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 6820b9c240..952033d1b8 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -585,8 +585,9 @@ The basics for using flexible indenting are explained in section |30.3| of the user manual. If you want to write your own indent file, it must set the 'indentexpr' -option. Setting the 'indentkeys' option is often useful. See the -$VIMRUNTIME/indent directory for examples. +option. Setting the 'indentkeys' option is often useful. +See the $VIMRUNTIME/indent/README.txt file for hints. +See the $VIMRUNTIME/indent directory for examples. REMARKS ABOUT SPECIFIC INDENT FILES ~ diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 7b9c418a46..7255af36e9 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -889,7 +889,7 @@ commands can be combined to create a NewGrep command: > 'smartcase' is not used. If {pattern} is empty (e.g. // is specified), the last used search pattern is used. |last-pattern| - +:{count}vim[grep] ... When a number is put before the command this is used as the maximum number of matches to find. Use ":1vimgrep pattern file" to find only the first. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 1373aff891..4564d84955 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -917,6 +917,9 @@ to the respective variable. Example: > To disable them use ":unlet". Example: > :unlet c_comment_strings +An alternative is to switch to the C++ highlighting: > + :set filetype=cpp + Variable Highlight ~ *c_gnu* GNU gcc specific items *c_comment_strings* strings and numbers inside a comment diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 243060a617..ac9e1f48fe 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -64,6 +64,10 @@ will not change within a Vim session. The |win_getid()| and |win_id2tabwin()| functions can be used to convert between the window/tab number and the identifier. There is also the window number, which may change whenever windows are opened or closed, see |winnr()|. +The window number is only valid in one specific tab. The window ID is valid +across tabs. For most functions that take a window ID or a window number, the +window number only applies to the current tab, while the window ID can refer +to a window in any tab. Each buffer has a unique number and the number will not change within a Vim session. The |bufnr()| and |bufname()| functions can be used to convert |