aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-01-01 15:00:39 +0100
committerGitHub <noreply@github.com>2023-01-01 15:00:39 +0100
commitc4942880be0521673548c48bf61c1eac6bd37036 (patch)
tree62fa779cea100f27a97035c68dbee0646390af4f /runtime/doc
parent83e8723864e24d9bf542e779d9612d3ffd014dbf (diff)
downloadrneovim-c4942880be0521673548c48bf61c1eac6bd37036.tar.gz
rneovim-c4942880be0521673548c48bf61c1eac6bd37036.tar.bz2
rneovim-c4942880be0521673548c48bf61c1eac6bd37036.zip
vim-patch:partial:f1dcd14fc5d4 (#21602)
Update runtime files https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 missing autocmd blocks and getscriptinfo() Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/diff.txt4
-rw-r--r--runtime/doc/options.txt19
-rw-r--r--runtime/doc/quickref.txt3
-rw-r--r--runtime/doc/sign.txt6
-rw-r--r--runtime/doc/syntax.txt2
5 files changed, 20 insertions, 14 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index f38f123393..382d025d3c 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -137,6 +137,10 @@ Otherwise they are set to their default value:
'foldmethod' "manual"
'foldcolumn' 0
+'foldenable' will most-likely be reset to off. That is when 'foldmethod' is
+restored to "manual". The folds themselves are not cleared but they should
+not show up, resetting 'foldenable' is the best way to do that.
+
==============================================================================
2. Viewing diffs *view-diffs*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b0c4193927..657d4bc06e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5573,30 +5573,30 @@ A jump table for the options with a short description can be found at |Q_op|.
and "[a]" instead of "appended" for ':w >> file' command
x use "[dos]" instead of "[dos format]", "[unix]" *shm-x*
instead of "[unix format]" and "[mac]" instead of "[mac
- format]".
+ format]"
a all of the above abbreviations *shm-a*
o overwrite message for writing a file with subsequent *shm-o*
message for reading a file (useful for ":wn" or when
'autowrite' on)
- O message for reading a file overwrites any previous *smh-O*
- message. Also for quickfix message (e.g., ":cn").
+ O message for reading a file overwrites any previous *shm-O*
+ message; also for quickfix message (e.g., ":cn")
s don't give "search hit BOTTOM, continuing at TOP" or *shm-s*
"search hit TOP, continuing at BOTTOM" messages; when using
the search count do not show "W" after the count message (see
S below)
t truncate file message at the start if it is too long *shm-t*
to fit on the command-line, "<" will appear in the left most
- column. Ignored in Ex mode.
+ column; ignored in Ex mode
T truncate other messages in the middle if they are too *shm-T*
- long to fit on the command line. "..." will appear in the
- middle. Ignored in Ex mode.
+ long to fit on the command line; "..." will appear in the
+ middle; ignored in Ex mode
W don't give "written" or "[w]" when writing a file *shm-W*
A don't give the "ATTENTION" message when an existing *shm-A*
- swap file is found.
+ swap file is found
I don't give the intro message when starting Vim, *shm-I*
- see |:intro|.
- c don't give |ins-completion-menu| messages. For *shm-c*
+ see |:intro|
+ c don't give |ins-completion-menu| messages; for *shm-c*
example, "-- XXX completion (YYY)", "match 1 of 2", "The only
match", "Pattern not found", "Back at original", etc.
C don't give messages while scanning for ins-completion *shm-C*
@@ -5653,6 +5653,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'showcmdloc'* *'sloc'*
'showcmdloc' 'sloc' string (default "last")
+ global
This option can be used to display the (partially) entered command in
another location. Possible values are:
last Last line of the screen (default).
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 5f5ca2af2c..da136ade16 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -868,7 +868,8 @@ Short explanation of each option: *option-list*
'shiftwidth' 'sw' number of spaces to use for (auto)indent step
'shortmess' 'shm' list of flags, reduce length of messages
'showbreak' 'sbr' string to use at the start of wrapped lines
-'showcmd' 'sc' show (partial) command in status line
+'showcmd' 'sc' show (partial) command somewhere
+'showcmdloc' 'sloc' where to show (partial) command
'showfulltag' 'sft' show full tag pattern when completing tag
'showmatch' 'sm' briefly jump to matching bracket if insert one
'showmode' 'smd' message on status line to show current mode
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index efe0c3390d..d09d0f226f 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -606,9 +606,9 @@ sign_placelist({list})
then a new unique identifier is allocated.
Otherwise the specified number is used. See
|sign-identifier| for more information.
- lnum line number in the buffer {buf} where the
- sign is to be placed. For the accepted values,
- see |line()|.
+ lnum line number in the buffer where the sign is to
+ be placed. For the accepted values, see
+ |line()|.
name name of the sign to place. See |sign_define()|
for more information.
priority priority of the sign. When multiple signs are
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index e8f0924cb4..49ca7e38f6 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4902,7 +4902,7 @@ in their own color.
*highlight-clear* *:hi-clear*
:hi[ghlight] clear Reset all highlighting to the defaults. Removes all
- highlighting for groups added by the user!
+ highlighting for groups added by the user.
Uses the current value of 'background' to decide which
default colors to use.
If there was a default link, restore it. |:hi-link|