aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-11-07 00:59:32 +0100
committerJustin M. Keyes <justinkz@gmail.com>2016-11-08 21:22:13 +0100
commit6a3f8d48d0c96330511565aef5e10ad965e986b4 (patch)
tree7a01e0eb67c2dd535c57511af9ebe2949a3bac65 /runtime
parent1e0e301062f30846f33457ba3a689266213b8378 (diff)
downloadrneovim-6a3f8d48d0c96330511565aef5e10ad965e986b4.tar.gz
rneovim-6a3f8d48d0c96330511565aef5e10ad965e986b4.tar.bz2
rneovim-6a3f8d48d0c96330511565aef5e10ad965e986b4.zip
'inccommand': rename 'incsubstitute'
'inccommand' allows us to expand the feature to other commands, such as: :cdo :cfdo :global Also rename "IncSubstitute" highlight group to "Substitute".
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt17
-rw-r--r--runtime/doc/syntax.txt5
-rw-r--r--runtime/doc/vim_diff.txt2
3 files changed, 13 insertions, 11 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f41983cf07..79e5ff090f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3466,6 +3466,15 @@ A jump table for the options with a short description can be found at |Q_op|.
The value is set to 1 when it is not -1 and setting the 'keymap'
option to a valid keymap name.
+ *'inccommand'* *'icm'*
+'inccommand' 'icm' string (default "")
+ global
+
+ "nosplit" : Shows the effects of a command incrementally, as you type.
+ "split" : Also shows partial off-screen results in a preview window.
+
+ Currently only works for |:substitute|. |hl-Substitute|
+
*'include'* *'inc'*
'include' 'inc' string (default "^\s*#\s*include")
global or local to buffer |global-local|
@@ -3526,14 +3535,6 @@ A jump table for the options with a short description can be found at |Q_op|.
CTRL-R CTRL-W can be used to add the word at the end of the current
match, excluding the characters that were already typed.
- *'incsubstitute'* *'ics'*
-'incsubstitute' 'ics' string (default "")
- global
-
- If "split" or "nosplit" then |:substitute| updates the buffer
- as-you-type. If "split", also show partial off-screen results in
- a window. Replacement text is hightlighted with |hl-IncSubstitute|.
-
*'indentexpr'* *'inde'*
'indentexpr' 'inde' string (default "")
local to buffer
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index a942c5de03..a9762a7121 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4852,8 +4852,9 @@ SignColumn column where |signs| are displayed
*hl-IncSearch*
IncSearch 'incsearch' highlighting; also used for the text replaced with
":s///c"
- *hl-IncSubstitute*
-IncSubstitute 'incsubstitute' replacement text
+ *hl-Substitute*
+Substitute |:substitute| replacement text highlighting
+
*hl-LineNr*
LineNr Line number for ":number" and ":#" commands, and when 'number'
or 'relativenumber' option is set.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 80db8eefb0..79381183a0 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -107,7 +107,7 @@ Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants
<C-Tab>, <C-S-Tab>, <C-BS>, <C-S-BS>, <C-Enter>, <C-S-Enter>
Options:
- 'incsubstitute' shows results while typing a |:substitute| command
+ 'inccommand' shows results while typing a |:substitute| command
'statusline' supports unlimited alignment sections
'tabline' %@Func@foo%X can call any function on mouse-click