diff options
author | Christian Clason <c.clason@uni-graz.at> | 2023-01-10 11:02:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-10 11:02:00 +0100 |
commit | d6cb3328f7e7286fb4aac116ea1bb0e6377fa803 (patch) | |
tree | d7b42c53f73b043538838e10b25a08bf98d9956f | |
parent | 87cfe50944ef2c84de98eb6b124fe312eef31313 (diff) | |
download | rneovim-d6cb3328f7e7286fb4aac116ea1bb0e6377fa803.tar.gz rneovim-d6cb3328f7e7286fb4aac116ea1bb0e6377fa803.tar.bz2 rneovim-d6cb3328f7e7286fb4aac116ea1bb0e6377fa803.zip |
vim-patch:1b5f03ec9c55 (#21715)
Update runtime files
https://github.com/vim/vim/commit/1b5f03ec9c5551047d5de8d845541dd3201abe7c
Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r-- | runtime/doc/map.txt | 4 | ||||
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/userfunc.txt | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index e262b7b82a..ccd48a8959 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -698,8 +698,8 @@ To avoid mapping of the characters you type in insert or Command-line mode, type a CTRL-V first. The mapping in Insert mode is disabled if the 'paste' option is on. *map-error* -Note that when an error is encountered (that causes an error message or beep) -the rest of the mapping is not executed. This is Vi-compatible. +Note that when an error is encountered (that causes an error message or might +cause a beep) the rest of the mapping is not executed. This is Vi-compatible. Note that the second character (argument) of the commands @zZtTfF[]rm'`"v and CTRL-X is not mapped. This was done to be able to use all the named diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index aa2f528d1b..4498dda300 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6071,6 +6071,8 @@ A jump table for the options with a short description can be found at |Q_op|. When there is error while evaluating the option then it will be made empty to avoid further errors. Otherwise screen updating would loop. + When the result contains unprintable characters the result is + unpredictable. Note that the only effect of 'ruler' when this option is set (and 'laststatus' is 2 or 3) is controlling the output of |CTRL-G|. diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt index 4d000efc1e..9c428175bb 100644 --- a/runtime/doc/userfunc.txt +++ b/runtime/doc/userfunc.txt @@ -180,7 +180,16 @@ See |:verbose-cmd| for more information. the number 0 is returned. Note that there is no check for unreachable lines, thus there is no warning if commands follow ":return". - + Also, there is no check if the following + line contains a valid command. Forgetting the line + continuation backslash may go unnoticed: > + return 'some text' + .. ' some more text' +< Will happily return "some text" without an error. It + should have been: > + return 'some text' + \ .. ' some more text' +< If the ":return" is used after a |:try| but before the matching |:finally| (if present), the commands following the ":finally" up to the matching |:endtry| |