summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-04-05 17:17:42 +0200
committerBram Moolenaar <Bram@vim.org>2012-04-05 17:17:42 +0200
commit3675fa09a753bdf0b5eaac209ed8d6739a7e95d4 (patch)
treef192d674c4e2aaf3fe84d9f87630c11e5ba139d9 /runtime
parent98411e57ab4f876e11d7df48889be348caa912b4 (diff)
downloadvim-3675fa09a753bdf0b5eaac209ed8d6739a7e95d4.zip
updated for version 7.3.492
Problem: Can't indent conditions separately from function arguments. Solution: Add the 'k' flag in 'cino. (Lech Lorens)
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/indent.txt20
1 files changed, 18 insertions, 2 deletions
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 9a4aaa79a..ce02178d7 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -460,6 +460,22 @@ The examples below assume a 'shiftwidth' of 4.
a_short_line(argument, a_short_line(argument,
argument); argument);
<
+ *cino-k*
+ kN When in unclosed parentheses which follow "if", "for" or
+ "while" and N is non-zero, overrides the behaviour defined by
+ "(N": causes the indent to be N characters relative to the outer
+ context (i.e. the line where "if", "for" or "while" is). Has
+ no effect on deeper levels of nesting. Affects flags like "wN"
+ only for the "if", "for" and "while" conditions. If 0, defaults
+ to behaviour defined by the "(N" flag. (default: 0).
+
+ cino=(0 cino=(0,ks >
+ if (condition1 if (condition1
+ && condition2) && condition2)
+ action(); action();
+ function(argument1 function(argument1
+ && argument2); && argument2);
+<
*cino-m*
mN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the line with the
@@ -530,14 +546,14 @@ The examples below assume a 'shiftwidth' of 4.
*cino-#*
#N When N is non-zero recognize shell/Perl comments, starting with
- '#'. Default N is zero: don't recognizes '#' comments. Note
+ '#'. Default N is zero: don't recognize '#' comments. Note
that lines starting with # will still be seen as preprocessor
lines.
The defaults, spelled out in full, are:
cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
- c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0
+ c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0
Vim puts a line in column 1 if:
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.