From 69a76feda9e9d308be6b5fc2185286a061dfecd6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 3 Aug 2017 17:54:03 +0200 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/misc1.c') diff --git a/src/misc1.c b/src/misc1.c index 4f33015a7..f19c2dc81 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -626,6 +626,9 @@ open_line( int do_si = (!p_paste && curbuf->b_p_si # 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 */ -- cgit v1.2.1