aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/autocmd.txt11
-rw-r--r--runtime/doc/change.txt1
-rw-r--r--runtime/doc/eval.txt27
-rw-r--r--runtime/doc/filetype.txt4
-rw-r--r--runtime/doc/index.txt2
-rw-r--r--runtime/doc/usr_11.txt2
6 files changed, 16 insertions, 31 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index dab737100d..7fcfa5de14 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1007,6 +1007,10 @@ TextChangedP After a change was made to the text in the
User Never executed automatically. To be used for
autocommands that are only executed with
":doautocmd".
+ Note that when `:doautocmd User MyEvent` is
+ used while there are no matching autocommands,
+ you will get an error. If you don't want
+ that, define a dummy autocommand yourself.
*UserGettingBored*
UserGettingBored When the user presses the same key 42 times.
Just kidding! :-)
@@ -1055,9 +1059,10 @@ WinEnter After entering another window. Not done for
If the window is for another buffer, Vim
executes the BufEnter autocommands after the
WinEnter autocommands.
- Note: When using ":split fname" the WinEnter
- event is triggered after the split but before
- the file "fname" is loaded.
+ Note: For split and tabpage commands the
+ WinEnter event is triggered after the split
+ or tab command but before the file is loaded.
+
*WinLeave*
WinLeave Before leaving a window. If the window to be
entered next is for a different buffer, Vim
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index f3dd0bd6df..028599880b 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -501,6 +501,7 @@ If the 'shiftround' option is on, the indent is rounded to a multiple of
If the 'smartindent' option is on, or 'cindent' is on and 'cinkeys' contains
'#' with a zero value, shift right does not affect lines starting with '#'
(these are supposed to be C preprocessor lines that must stay in column 1).
+This can be changed with the 'cino' option, see |cino-#|.
When the 'expandtab' option is off (this is the default) Vim uses <Tab>s as
much as possible to make the indent. You can use ">><<" to replace an indent
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 9d84ff59c6..eaf0b58e2b 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2339,7 +2339,7 @@ tolower({expr}) String the String {expr} switched to lowercase
toupper({expr}) String the String {expr} switched to uppercase
tr({src}, {fromstr}, {tostr}) String translate chars of {src} in {fromstr}
to chars in {tostr}
-trim({text}[, {mask}]) String trim characters in {mask} from {text}
+trim({text}[, {mask}]) String trim characters in {mask} from {text}
trunc({expr}) Float truncate Float {expr}
type({name}) Number type of variable {name}
undofile({name}) String undo file name for {name}
@@ -5883,31 +5883,6 @@ nvim_...({...}) *nvim_...()* *eval-api*
also take the numerical value 0 to indicate the current
(focused) object.
-option_restore({list}) *option_restore()*
- Restore options previously saved by option_save().
- When buffer-local options have been saved, this function must
- be called when the same buffer is the current buffer.
- When window-local options have been saved, this function must
- be called when the same window is the current window.
- When in the wrong buffer and/or window an error is given and
- the local options won't be restored.
- NOT IMPLEMENTED YET!
-
-option_save({list}) *option_save()*
- Saves the options named in {list}. The returned value can be
- passed to option_restore(). Example: >
- let s:saved_options = option_save([
- \ 'ignorecase',
- \ 'iskeyword',
- \ ])
- au <buffer> BufLeave *
- \ call option_restore(s:saved_options)
-< The advantage over using `:let` is that global and local
- values are handled and the script ID is restored, so that
- `:verbose set` will show where the option was originally set,
- not where it was restored.
- NOT IMPLEMENTED YET!
-
or({expr}, {expr}) *or()*
Bitwise OR on the two arguments. The arguments are converted
to a number. A List, Dict or Float argument causes an error.
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 286d96b684..473f4d9a3b 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -273,6 +273,10 @@ then Vim will load all plugins in these directories and below:
Note that the last one is the value of $VIMRUNTIME which has been expanded.
+Note that when using a plugin manager or |packages| many directories will be
+added to 'runtimepath'. These plugins earch require their own directory,
+don't put them directly in ~/.vim/plugin.
+
What if it looks like your plugin is not being loaded? You can find out what
happens when Vim starts up by using the |-V| argument: >
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index f4f43aeac2..0a71b1bd8e 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -944,7 +944,7 @@ tag command note action in Visual mode ~
|v_i{| i{ same as iB
|v_i}| i} same as iB
|v_o| o move cursor to other corner of area
-|v_r| r 2 delete highlighted area and start insert
+|v_r| r 2 replace highlighted area with a character
|v_s| s 2 delete highlighted area and start insert
|v_u| u 2 make highlighted area lowercase
|v_v| v make Visual mode characterwise or stop
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 42aa1d9100..8a6b74bb8b 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -234,7 +234,7 @@ that file, be prepared to redo your last changes.
WHAT TO DO? *swap-exists-choices*
-If dialogs are supported you will be asked to select one of five choices:
+If dialogs are supported you will be asked to select one of six choices:
Swap file ".main.c.swp" already exists! ~
[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort, (D)elete it: ~