Mercurial > vim

changeset 6016:0b7586868f6d v7.4.348

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.348 Problem: When using "J1" in 'cinoptions' a line below a continuation line gets too much indent. Solution: Fix parenthesis in condition.
author Bram Moolenaar <bram@vim.org>
date Wed, 02 Jul 2014 17:02:36 +0200
parents dd88acaa1a57
children 7be65fcedd0b
files src/misc1.c src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -7497,9 +7497,11 @@ get_c_indent()
 	     *			ldfd) {
 	     *		    }
 	     */
-	    if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label
-			   && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
+	    if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
+			   && cin_iscase(skipwhite(ml_get_curline()), FALSE))
 		amount = get_indent();
+	    else if (curbuf->b_ind_js)
+		amount = get_indent_lnum(lnum);
 	    else
 		amount = skip_label(lnum, &l);
 
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    348,
+/**/
     347,
 /**/
     346,