commit 69a76feda9e9d308be6b5fc2185286a061dfecd6
author Bram Moolenaar <Bram@vim.org> Thu Aug 03 17:54:03 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Aug 03 17:54:03 2017 +0200
tree 83c20b5599d9b280af8d919db6d81afc77c91292
parent 01efafad12102df0f1e341d6cadcb7be971591c1

patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is set

Problem:    'smartindent' is used even when 'indentexpr' is set.
Solution:   Ignore 'smartindent' when 'indentexpr' is set. (Hirohito Higashi)

src/misc1.c

diff --git a/src/misc1.c b/src/misc1.c
index 4f33015..f19c2dc 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -627,6 +627,9 @@
 # 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 */