From e7eb789ef0d2dadf5824a0c6fbd452b1feb272e2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 2 Jul 2014 17:02:36 +0200 Subject: 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. --- src/misc1.c | 6 ++++-- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index fbd94d946..c0a045d14 100644 --- 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); diff --git a/src/version.c b/src/version.c index a6b030d2f..214f24a8b 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 348, /**/ 347, /**/ -- cgit v1.2.1