aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-07 01:38:06 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-11-07 01:46:19 +0100
commit85cfc4c4f9fdbd25e0ece129840d654c049f85b6 (patch)
tree1ad063ea8753675b42b404313920026aedb092ca /runtime/doc
parenta39bf019580d82f8ca5f9e8d99dd856418ffc491 (diff)
downloadrneovim-85cfc4c4f9fdbd25e0ece129840d654c049f85b6.tar.gz
rneovim-85cfc4c4f9fdbd25e0ece129840d654c049f85b6.tar.bz2
rneovim-85cfc4c4f9fdbd25e0ece129840d654c049f85b6.zip
vim-patch:74675a666b51
Updated runtime files and translations. https://github.com/vim/vim/commit/74675a666b51edd61e0210132658d81a86c5102c
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/autocmd.txt3
-rw-r--r--runtime/doc/cmdline.txt3
-rw-r--r--runtime/doc/editing.txt2
-rw-r--r--runtime/doc/if_cscop.txt7
-rw-r--r--runtime/doc/quickref.txt1
5 files changed, 11 insertions, 5 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index dfcabf9e7d..64066595f8 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -643,7 +643,8 @@ FileType When the 'filetype' option has been set. The
pattern is matched against the filetype.
<afile> can be used for the name of the file
where this option was set, and <amatch> for
- the new value of 'filetype'.
+ the new value of 'filetype'. Navigating to
+ another window or buffer is not allowed.
See |filetypes|.
*FileWriteCmd*
FileWriteCmd Before writing to a file, when not writing the
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index d29d3be45f..e609b16f0f 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -420,6 +420,9 @@ matches exactly one character.
The 'wildignorecase' option can be set to ignore case in filenames.
+The 'wildmenu' option can be set to show the matches just above the command
+line.
+
If you like tcsh's autolist completion, you can use this mapping:
:cnoremap X <C-L><C-D>
(Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 9f771374ed..c478ad1bf3 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1265,7 +1265,7 @@ Commands for changing the working directory can be suffixed with a bang "!"
*:lc* *:lcd*
:lc[d][!] {path} Like |:cd|, but only set the current directory for the
current window. The current directory for other
- windows or any tabs is not changed.
+ windows or tabs is not changed.
*:lch* *:lchdir*
:lch[dir][!] Same as |:lcd|.
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index e359f2144c..ac3d7a9ed8 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -82,9 +82,10 @@ suggested use.)
2. Cscope related commands *cscope-commands*
*:cscope* *:cs* *:scs* *:scscope* *E259* *E262* *E561* *E560*
-All cscope commands are accessed through suboptions to the main cscope
-command ":cscope". The shortest abbreviation is ":cs". The ":scscope"
-command does the same and also splits the window (short: "scs").
+All cscope commands are accessed through suboptions to the cscope commands.
+ `:cscope` or `:cs` is the main command
+ `:scscope` or `:scs` does the same and splits the window
+ `:lcscope` or `:lcs` uses the location list, see |:lcscope|
The available subcommands are:
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 16fdc6bda9..b22d2afa7e 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1253,6 +1253,7 @@ Context-sensitive completion on the command-line:
|:sfind| :sf[ind] {file} split window, find {file} in 'path'
and edit it
+|:terminal| :terminal {cmd} open a terminal window
|CTRL-W_]| CTRL-W ] split window and jump to tag under
cursor
|CTRL-W_f| CTRL-W f split window and edit file name under