Mercurial > vim
changeset 11943:268b1036cd17 v8.0.0851
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 03 Aug 2017 18:00:04 +0200 |
| parents | aac19f0c0e92 |
| children | 60014330374d |
| files | src/misc1.c src/testdir/test_smartindent.vim src/version.c |
| diffstat | 3 files changed, 32 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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