diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-03 17:54:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-03 17:54:03 +0200 |
| commit | 69a76feda9e9d308be6b5fc2185286a061dfecd6 (patch) | |
| tree | 83c20b5599d9b280af8d919db6d81afc77c91292 | |
| parent | 01efafad12102df0f1e341d6cadcb7be971591c1 (diff) | |
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is setv8.0.0851
Problem: 'smartindent' is used even when 'indentexpr' is set.
Solution: Ignore 'smartindent' when 'indentexpr' is set. (Hirohito Higashi)
| -rw-r--r-- | src/misc1.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_smartindent.vim | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 32 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c index 4f33015a79..f19c2dc811 100644 --- 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 index d00eac9798..9e93a55eb0 100644 --- 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 index c5c39fea2f..a5a3d68a19 100644 --- 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, |