summaryrefslogtreecommitdiff
path: root/src/misc1.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-03 17:54:03 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-03 17:54:03 +0200
commit69a76feda9e9d308be6b5fc2185286a061dfecd6 (patch)
tree83c20b5599d9b280af8d919db6d81afc77c91292 /src/misc1.c
parent01efafad12102df0f1e341d6cadcb7be971591c1 (diff)
downloadvim-git-69a76feda9e9d308be6b5fc2185286a061dfecd6.tar.gz
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is setv8.0.0851
Problem: 'smartindent' is used even when 'indentexpr' is set. Solution: Ignore 'smartindent' when 'indentexpr' is set. (Hirohito Higashi)
Diffstat (limited to 'src/misc1.c')
-rw-r--r--src/misc1.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 4f33015a7..f19c2dc81 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -627,6 +627,9 @@ open_line(
# ifdef FEAT_CINDENT
&& !curbuf->b_p_cin
# endif
+# ifdef FEAT_EVAL
+ && *curbuf->b_p_inde == NUL
+# endif
);
int no_si = FALSE; /* reset did_si afterwards */
int first_char = NUL; /* init for GCC */