# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1501776004 -7200
# Node ID 268b1036cd17c9393a78be312ec44c5175304d58
# Parent  aac19f0c0e92d5d18be5695f90180bb39089fa6a
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is set

commit https://github.com/vim/vim/commit/69a76feda9e9d308be6b5fc2185286a061dfecd6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Aug 3 17:54:03 2017 +0200

    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)

diff --git a/src/misc1.c b/src/misc1.c
--- 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 */
diff --git a/src/testdir/test_smartindent.vim b/src/testdir/test_smartindent.vim
--- a/src/testdir/test_smartindent.vim
+++ b/src/testdir/test_smartindent.vim
@@ -1,3 +1,4 @@
+" Tests for smartindent
 
 " Tests for not doing smart indenting when it isn't set.
 function! Test_nosmartindent()
@@ -12,3 +13,29 @@ function! Test_nosmartindent()
   call assert_equal("		#test", getline(1))
   enew! | close
 endfunction
+
+function MyIndent()
+endfunction
+
+" When 'indentexpr' is set, setting 'si' has no effect.
+function Test_smartindent_has_no_effect()
+  new
+  exe "normal! i\<Tab>one\<Esc>"
+  set noautoindent
+  set smartindent
+  set indentexpr=
+  exe "normal! Gotwo\<Esc>"
+  call assert_equal("\ttwo", getline("$"))
+
+  set indentexpr=MyIndent
+  exe "normal! Gothree\<Esc>"
+  call assert_equal("three", getline("$"))
+
+  delfunction! MyIndent
+  set autoindent&
+  set smartindent&
+  set indentexpr&
+  bwipe!
+endfunction
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    851,
+/**/
     850,
 /**/
     849,