summaryrefslogtreecommitdiffstats
path: root/src/change.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-10-15 10:49:36 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-15 10:49:36 +0100
commita79b35b5781ae770334cec781d17fec3875f8108 (patch)
tree7880c30158c21d03871822c8961b268d1ec07656 /src/change.c
parentb77bdce120d7e140d0d0bd535ec9febdef78993d (diff)
patch 9.0.0754: 'indentexpr' overrules lisp indenting in one situationv9.0.0754
Problem: 'indentexpr' overrules lisp indenting in one situation. Solution: Add "else" to keep the lisp indent. (issue #11327)
Diffstat (limited to 'src/change.c')
-rw-r--r--src/change.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/change.c b/src/change.c
index 84afcc7338..c409acdadd 100644
--- a/src/change.c
+++ b/src/change.c
@@ -2269,19 +2269,18 @@ open_line(
else
vreplace_mode = 0;
- // May do lisp indenting.
if (!p_paste
&& leader == NULL
&& curbuf->b_p_lisp
&& curbuf->b_p_ai)
{
+ // do lisp indenting
fixthisline(get_lisp_indent);
ai_col = (colnr_T)getwhitecols_curline();
}
-
- // May do indenting after opening a new line.
- if (do_cindent)
+ else if (do_cindent)
{
+ // do 'cindent' or 'indentexpr' indenting
do_c_expr_indent();
ai_col = (colnr_T)getwhitecols_curline();
}