aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-08-09 10:43:28 +0200
committerGitHub <noreply@github.com>2022-08-09 10:43:28 +0200
commita5e846b9969b1dfbd7e92f437f3ac7905039b84f (patch)
tree04ea16853179df83e33bbc36a1d96168925d2bc2 /runtime/doc
parente6680ea7c3912d38f2ef967e053be741624633ad (diff)
downloadrneovim-a5e846b9969b1dfbd7e92f437f3ac7905039b84f.tar.gz
rneovim-a5e846b9969b1dfbd7e92f437f3ac7905039b84f.tar.bz2
rneovim-a5e846b9969b1dfbd7e92f437f3ac7905039b84f.zip
vim-patch:partial: 48c3f4e0bff7 (#19684)
vim-patch:partial:48c3f4e0bff7 Update runtime files https://github.com/vim/vim/commit/48c3f4e0bff7efd289a7001b68c777b6f89a7057 partially skip `options.txt` (needs 9.0.0138)
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/help.txt1
-rw-r--r--runtime/doc/options.txt7
-rw-r--r--runtime/doc/usr_41.txt6
3 files changed, 8 insertions, 6 deletions
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 2a7125a044..e9fd2888ac 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -25,6 +25,7 @@ Get specific help: It is possible to go directly to whatever you want help
Option ' :help 'textwidth'
Regular expression / :help /[
See |help-summary| for more contexts and an explanation.
+ See |notation| for an explanation of the help syntax.
Search for help: Type ":help word", then hit CTRL-D to see matching
help entries for "word".
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f0977c91de..f8e60f0d0d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1325,7 +1325,8 @@ A jump table for the options with a short description can be found at |Q_op|.
page can have a different value.
When 'cmdheight' is zero, there is no command-line unless it is being
- used. Any messages will cause the |hit-enter| prompt.
+ used. Some informative messages will not be displayed, any other
+ messages will cause the |hit-enter| prompt.
*'cmdwinheight'* *'cwh'*
'cmdwinheight' 'cwh' number (default 7)
@@ -3735,8 +3736,8 @@ A jump table for the options with a short description can be found at |Q_op|.
*'lispwords'* *'lw'*
'lispwords' 'lw' string (default is very long)
global or local to buffer |global-local|
- Comma-separated list of words that influence the Lisp indenting.
- |'lisp'|
+ Comma-separated list of words that influence the Lisp indenting when
+ enabled with the |'lisp'| option.
*'list'* *'nolist'*
'list' boolean (default off)
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index bc2f7f077b..af5ef0ab2d 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -202,9 +202,9 @@ message when it doesn't, append !: >
:unlet! s:count
-When a script finishes, the local variables used there will not be
-automatically freed. The next time the script executes, it can still use the
-old value. Example: >
+When a script has been processed to the end, the local variables declared
+there will not be deleted. Functions defined in the script can use them.
+Example:
:if !exists("s:call_count")
: let s:call_count = 0