]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.348 v7.4.348
authorBram Moolenaar <Bram@vim.org>
Wed, 2 Jul 2014 15:02:36 +0000 (17:02 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 2 Jul 2014 15:02:36 +0000 (17:02 +0200)
Problem:    When using "J1" in 'cinoptions' a line below a continuation line
            gets too much indent.
Solution:   Fix parenthesis in condition.

src/misc1.c
src/version.c

index fbd94d94627e308fc8c18167827051a98df7db74..c0a045d14dfe2470619e3ecf3f5632db5f45a7f9 100644 (file)
@@ -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);
 
index a6b030d2feb051b2051ed130f52b603c39b9b94a..214f24a8b3eaf18747e0ddbbb897b735ccaf3bb6 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    348,
 /**/
     347,
 /**/