diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-07-02 17:02:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-07-02 17:02:36 +0200 |
| commit | e7eb789ef0d2dadf5824a0c6fbd452b1feb272e2 (patch) | |
| tree | 19e505bcbcfb781586f2655e6976773f694d66c2 | |
| parent | b7d929a86f4c3c4d127b37728b26f3a4632b8474 (diff) | |
| download | vim-git-e7eb789ef0d2dadf5824a0c6fbd452b1feb272e2.tar.gz | |
updated for version 7.4.348v7.4.348
Problem: When using "J1" in 'cinoptions' a line below a continuation line
gets too much indent.
Solution: Fix parenthesis in condition.
| -rw-r--r-- | src/misc1.c | 6 | ||||
| -rw-r--r-- | 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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 348, +/**/ 347, /**/ 346, |