diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-03-30 13:12:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 12:12:12 +0100 |
| commit | ac1dd046c01e0685b0f8eeaa36e622b3c2f339ad (patch) | |
| tree | 8e4df0f027aead0165464918be6d24a37298e26f /runtime/doc | |
| parent | 75ff156d9b11f23f6156cd6b90fb7bad0a83fd18 (diff) | |
| download | rneovim-ac1dd046c01e0685b0f8eeaa36e622b3c2f339ad.tar.gz rneovim-ac1dd046c01e0685b0f8eeaa36e622b3c2f339ad.tar.bz2 rneovim-ac1dd046c01e0685b0f8eeaa36e622b3c2f339ad.zip | |
vim-patch:46eea444d (#17920)
Update runtime files
https://github.com/vim/vim/commit/46eea444d992c2ae985cabb775a5d283f8e16df3
Skip repeat.txt as it only has vim9-specific changes.
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/autocmd.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/builtin.txt | 17 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 3 |
4 files changed, 16 insertions, 14 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 54fb4c14a0..7cfac4b5d1 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -499,10 +499,10 @@ CursorMoved After the cursor was moved in Normal or Visual mode or to another window. Also when the text of the cursor line has been changed, e.g. with "x", "rx" or "p". - Not triggered when there is typeahead, while - executing a script file, or when an operator - is pending. Always triggered when moving to - another window. + Not always triggered when there is typeahead, + while executing commands in a script file, or + when an operator is pending. Always triggered + when moving to another window. For an example see |match-parens|. Note: Cannot be skipped with |:noautocmd|. Careful: This is triggered very often, don't diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 14353662d1..062f39f3e7 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1319,14 +1319,15 @@ confirm({msg} [, {choices} [, {default} [, {type}]]]) or another valid interrupt key, confirm() returns 0. An example: > - :let choice = confirm("What do you want?", "&Apples\n&Oranges\n&Bananas", 2) - :if choice == 0 - : echo "make up your mind!" - :elseif choice == 3 - : echo "tasteful" - :else - : echo "I prefer bananas myself." - :endif + let choice = confirm("What do you want?", + \ "&Apples\n&Oranges\n&Bananas", 2) + if choice == 0 + echo "make up your mind!" + elseif choice == 3 + echo "tasteful" + else + echo "I prefer bananas myself." + endif < In a GUI dialog, buttons are used. The layout of the buttons depends on the 'v' flag in 'guioptions'. If it is included, the buttons are always put vertically. Otherwise, confirm() diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index cd6c2c8622..05bf0fe4ba 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -780,7 +780,7 @@ If the previous expansion was split, because it got longer than 'textwidth', then just the text in the current line will be used. If the match found is at the end of a line, then the first word in the next -line will be inserted and the message "word from next line" displayed, if +line will be inserted and the message "Word from other line" displayed, if this word is accepted the next CTRL-X CTRL-P or CTRL-X CTRL-N will search for those lines starting with this word. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c0a7b73438..b825a5fe15 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -751,7 +751,8 @@ A jump table for the options with a short description can be found at |Q_op|. nostop like start, except CTRL-W and CTRL-U do not stop at the start of insert. - When the value is empty, Vi compatible backspacing is used. + When the value is empty, Vi compatible backspacing is used, none of + the ways mentioned for the items above are possible. For backwards compatibility with version 5.4 and earlier: value effect ~ |