From b2633bba732a4ddd8f847b2bd445e53f93fa5d60 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Tue, 5 Jun 2018 02:20:38 -0400
Subject: vim-patch:8.0.0851: 'smartindent' is used even when 'indentexpr' is
 set (#8481)

Problem:    'smartindent' is used even when 'indentexpr' is set.
Solution:   Ignore 'smartindent' when 'indentexpr' is set. (Hirohito Higashi)
https://github.com/vim/vim/commit/69a76feda9e9d308be6b5fc2185286a061dfecd6

---

This also fixes "delfunction!" which was not merged fully in  a185ab70fd2eb8d55 (vim-patch:8.0.0655)
---
 src/nvim/testdir/test_smartindent.vim | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_smartindent.vim b/src/nvim/testdir/test_smartindent.vim
index d00eac9798..9e93a55eb0 100644
--- a/src/nvim/testdir/test_smartindent.vim
+++ b/src/nvim/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
-- 
cgit