aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-01 22:30:40 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-01 22:44:59 +0200
commit41fe644124140c4a303de4a5a84e28efec918274 (patch)
treec38e74f319e5977c008161ea3535cbf35b029d3d /runtime
parenta14fc7b159dcc0f39e8aff68763dff92cb364d18 (diff)
downloadrneovim-41fe644124140c4a303de4a5a84e28efec918274.tar.gz
rneovim-41fe644124140c4a303de4a5a84e28efec918274.tar.bz2
rneovim-41fe644124140c4a303de4a5a84e28efec918274.zip
vim-patch:26967617a30e
Update runtime files. https://github.com/vim/vim/commit/26967617a30e55aedc98b8f14b841d88469abd0e NA: vim-patch:55d81cd2a15d
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/autocmd.txt10
-rw-r--r--runtime/doc/index.txt8
-rw-r--r--runtime/doc/motion.txt4
-rw-r--r--runtime/doc/options.txt6
-rw-r--r--runtime/doc/pi_netrw.txt6
-rw-r--r--runtime/doc/spell.txt10
-rw-r--r--runtime/doc/usr_05.txt2
-rw-r--r--runtime/doc/visual.txt2
-rw-r--r--runtime/doc/windows.txt6
9 files changed, 34 insertions, 20 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 47afc4bd21..ffd9133ef5 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -648,6 +648,7 @@ CursorMoved After the cursor was moved in Normal or Visual
Not triggered when there is typeahead or when
an operator is pending.
For an example see |match-parens|.
+ Note: Cannot be skipped with `:noautocmd`.
Careful: This is triggered very often, don't
do anything that the user does not expect or
that is slow.
@@ -1050,6 +1051,8 @@ TextChanged After a change was made to the text in the
was defined).
Not triggered when there is typeahead or when
an operator is pending.
+ Note: This can not be skipped with
+ `:noautocmd`.
Careful: This is triggered very often, don't
do anything that the user does not expect or
that is slow.
@@ -1474,8 +1477,8 @@ If you want the buffer to be unmodified after changing it, reset the
instead of ":q!".
*autocmd-nested* *E218*
-By default, autocommands do not nest. If you use ":e" or ":w" in an
-autocommand, Vim does not execute the BufRead and BufWrite autocommands for
+By default, autocommands do not nest. For example, if you use ":e" or ":w" in
+an autocommand, Vim does not execute the BufRead and BufWrite autocommands for
those commands. If you do want this, use the "++nested" flag for those
commands in which you want nesting. For example: >
:autocmd FileChangedShell *.c ++nested e!
@@ -1621,5 +1624,8 @@ following command. Example: >
This will write the file without triggering the autocommands defined by the
gzip plugin.
+Note that some autocommands are not triggered right away, but only later.
+This specifically applies to |CursorMoved| and |TextChanged|.
+
vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 305d5be404..6b80ab1ac2 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -569,6 +569,8 @@ tag command action in Normal mode ~
|CTRL-W_gF| CTRL-W g F edit file name under the cursor in a new
tab page and jump to the line number
following the file name.
+|CTRL-W_gt| CTRL-W g t same as `gt`: go to next tab page
+|CTRL-W_gT| CTRL-W g T same as `gT`: go to previous tab page
|CTRL-W_h| CTRL-W h go to Nth left window (stop at first window)
|CTRL-W_i| CTRL-W i split window and jump to declaration of
identifier under the cursor
@@ -858,7 +860,7 @@ tag char note action in Normal mode ~
These can be used after an operator, but before a {motion} has been entered.
-tag char action in Insert mode ~
+tag char action in Operator-pending mode ~
-----------------------------------------------------------------------
|o_v| v force operator to work characterwise
|o_V| V force operator to work linewise
@@ -986,7 +988,7 @@ Normal characters are inserted at the current cursor position.
"Completion" below refers to context-sensitive completion. It will complete
file names, tags, commands etc. as appropriate.
-tag command action in Command-line editing mode ~
+tag command action in Command-line editing mode ~
------------------------------------------------------------------------------
CTRL-@ not used
|c_CTRL-A| CTRL-A do completion on the pattern in front of the
@@ -1085,7 +1087,7 @@ This is a brief but complete listing of all the ":" commands, without
mentioning any arguments. The optional part of the command name is inside [].
The commands are sorted on the non-optional part of their name.
-tag command action ~
+tag command action ~
------------------------------------------------------------------------------
|:!| :! filter lines or execute an external command
|:!!| :!! repeat last ":!" command
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 461fefe903..818bbf9eb7 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -310,7 +310,7 @@ _ <underscore> [count] - 1 lines downward, on the first non-blank
G Goto line [count], default last line, on the first
non-blank character |linewise|. If 'startofline' not
set, keep the same column.
- G is a one of |jump-motions|.
+ G is one of the |jump-motions|.
*<C-End>*
<C-End> Goto line [count], default last line, on the last
@@ -989,7 +989,7 @@ These commands are not marks themselves, but jump to a mark:
A "jump" is a command that normally moves the cursor several lines away. If
you make the cursor "jump" the position of the cursor before the jump is
-remembered. You can return to that position with the "''" and "``" command,
+remembered. You can return to that position with the "''" and "``" commands,
unless the line containing that position was changed or deleted. The
following commands are "jump" commands: "'", "`", "G", "/", "?", "n", "N",
"%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and the
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a94bbc5599..707073d158 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -324,9 +324,9 @@ Setting the filetype
When the optional FALLBACK argument is present, a
later :setfiletype command will override the
- 'filetype'. This is to used for filetype detections
- that are just a guess. |did_filetype()| will return
- false after this command.
+ 'filetype'. This is to be used for filetype
+ detections that are just a guess. |did_filetype()|
+ will return false after this command.
*option-window* *optwin*
:bro[wse] se[t] *:set-browse* *:browse-set* *:opt* *:options*
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index a0e071d4dd..95726324ef 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -3433,7 +3433,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
- Click "Add..."
- Set External Editor (adjust path as needed, include
the quotes and !.! at the end):
- "c:\Program Files\Vim\vim70\gvim.exe" !.!
+ "c:\Program Files\Vim\vim81\gvim.exe" !.!
- Check that the filetype in the box below is
{asterisk}.{asterisk} (all files), or whatever types
you want (cec: change {asterisk} to * ; I had to
@@ -3683,8 +3683,8 @@ by obtaining a copy of the latest (often developmental) netrw at:
The <netrw.vim> script is typically installed on systems as something like:
>
- /usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
- /usr/local/share/vim/vim7x/autoload/netrw.vim
+ /usr/local/share/vim/vim8x/plugin/netrwPlugin.vim
+ /usr/local/share/vim/vim8x/autoload/netrw.vim
(see output of :echo &rtp)
<
which is loaded automatically at startup (assuming :set nocp). If you
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 67917d9617..955861bd2d 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -298,25 +298,25 @@ Exceptions:
spell file is used.
For example, with these values:
- 'runtimepath' is "~/.config/nvim,/usr/share/vim70,~/.config/nvim/after"
+ 'runtimepath' is "~/.config/nvim,/usr/local/share/nvim/runtime/,~/.config/nvim/after"
'encoding' is "iso-8859-2"
'spelllang' is "pl"
Vim will look for:
1. ~/.config/nvim/spell/pl.iso-8859-2.spl
-2. /usr/share/vim70/spell/pl.iso-8859-2.spl
+2. /usr/local/share/nvim/runtime/spell/pl.iso-8859-2.spl
3. ~/.config/nvim/spell/pl.iso-8859-2.add.spl
-4. /usr/share/vim70/spell/pl.iso-8859-2.add.spl
+4. /usr/local/share/nvim/runtime/spell/pl.iso-8859-2.add.spl
5. ~/.config/nvim/after/spell/pl.iso-8859-2.add.spl
This assumes 1. is not found and 2. is found.
If 'encoding' is "latin1" Vim will look for:
1. ~/.config/nvim/spell/pl.latin1.spl
-2. /usr/share/vim70/spell/pl.latin1.spl
+2. /usr/local/share/nvim/runtime/spell/pl.latin1.spl
3. ~/.config/nvim/after/spell/pl.latin1.spl
4. ~/.config/nvim/spell/pl.ascii.spl
-5. /usr/share/vim70/spell/pl.ascii.spl
+5. /usr/local/share/nvim/runtime/spell/pl.ascii.spl
6. ~/.config/nvim/after/spell/pl.ascii.spl
This assumes none of them are found (Polish doesn't make sense when leaving
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index d85be4ccae..e21481af17 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -192,7 +192,7 @@ typing commands at the command-line.
\ | wincmd p | diffthis
This adds the ":DiffOrig" command. Use this in a modified buffer to see the
-differences with the file it was loaded from. See |diff|.
+differences with the file it was loaded from. See |diff| and |:DiffOrig|.
>
set nolangremap
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 4f29577680..2062696a4e 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -103,7 +103,7 @@ gn Search forward for the last used search pattern, like
E.g., "dgn" deletes the text of the next match.
If Visual mode is active, extends the selection
until the end of the next match.
- Note: Unlinke `n` the search direction does not depend
+ Note: Unlike `n` the search direction does not depend
on the previous search command.
*gN* *v_gN*
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index ac9e1f48fe..b93945a340 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -807,6 +807,12 @@ CTRL-W gF *CTRL-W_gF*
{not available when the |+file_in_path| feature was disabled
at compile time}
+CTRL-W gt *CTRL-W_gt*
+ Go to next tab page, same as `gt`.
+
+CTRL-W gT *CTRL-W_gT*
+ Go to previous tab page, same as `gT`.
+
Also see |CTRL-W_CTRL-I|: open window for an included file that includes
the keyword under the cursor.