summaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-31 14:12:57 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-31 14:12:57 +0100
commitce655743ba5c56c00769e57e6a6608c0088211ab (patch)
treec2c038dd034db0123e4f711a1f530f1dfea806b3 /runtime/doc
parent4b47162ccede0b6d9cbb9473ad870220a24fbf54 (diff)
downloadvim-git-ce655743ba5c56c00769e57e6a6608c0088211ab.tar.gz
patch 8.1.0858: 'indentkeys' and 'cinkeys' defaults are differentv8.1.0858
Problem: 'indentkeys' and 'cinkeys' defaults are different. Solution: Make them the same, update docs. (close #3882)
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/indent.txt5
-rw-r--r--runtime/doc/options.txt4
2 files changed, 5 insertions, 4 deletions
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 2c12fe417..299d1ac68 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -60,12 +60,13 @@ typing certain characters or commands in certain contexts. Note that this not
only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is
used instead. The format of 'cinkeys' and 'indentkeys' is equal.
-The default is "0{,0},0),:,0#,!^F,o,O,e" which specifies that indenting occurs
-as follows:
+The default is "0{,0},0),0],:,0#,!^F,o,O,e" which specifies that indenting
+occurs as follows:
"0{" if you type '{' as the first character in a line
"0}" if you type '}' as the first character in a line
"0)" if you type ')' as the first character in a line
+ "0]" if you type ']' as the first character in a line
":" if you type ':' after a label or case statement
"0#" if you type '#' as the first character in a line
"!^F" if you type CTRL-F (which is not inserted)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 128b34cba..266749006 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1564,7 +1564,7 @@ A jump table for the options with a short description can be found at |Q_op|.
NOTE: This option is reset when 'compatible' is set.
*'cinkeys'* *'cink'*
-'cinkeys' 'cink' string (default "0{,0},0),:,0#,!^F,o,O,e")
+'cinkeys' 'cink' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|
@@ -4607,7 +4607,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'indentkeys'* *'indk'*
-'indentkeys' 'indk' string (default "0{,0},:,0#,!^F,o,O,e")
+'indentkeys' 'indk' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|