updated for version 7.3.201
Problem: "} else" still causes following lines to be indented too much.
Solution: Better detection for the "else" block. (Lech Lorens)
diff --git a/src/misc1.c b/src/misc1.c
index 0959e2a..0fc02ba 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -7541,17 +7541,25 @@
/*
* When searching for a terminated line, don't use the
- * one between the "if" and the "else".
+ * one between the "if" and the matching "else".
* Need to use the scope of this "else". XXX
* If whilelevel != 0 continue looking for a "do {".
*/
- if (cin_iselse(l)
- && whilelevel == 0
- && ((trypos = find_start_brace(ind_maxcomment))
- == NULL
+ if (cin_iselse(l) && whilelevel == 0)
+ {
+ /* If we're looking at "} else", let's make sure we
+ * find the opening brace of the enclosing scope,
+ * not the one from "if () {". */
+ if (*l == '}')
+ curwin->w_cursor.col =
+ (l - ml_get_curline()) + 1;
+
+ if ((trypos = find_start_brace(ind_maxcomment))
+ == NULL
|| find_match(LOOKFOR_IF, trypos->lnum,
- ind_maxparen, ind_maxcomment) == FAIL))
- break;
+ ind_maxparen, ind_maxcomment) == FAIL)
+ break;
+ }
}
/*
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index 05efa98..0d37205 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
Binary files differ
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index 2e62272..852a4c5 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -1262,3 +1262,14 @@
foo();
}
+
+void func(void)
+{
+ for (int i = 0; i < 10; ++i)
+ if (i & 1) {
+ foo(1);
+ } else
+ foo(0);
+ baz();
+}
+
diff --git a/src/version.c b/src/version.c
index 14537c6..64f49af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 201,
+/**/
200,
/**/
199,
