Permalink
Browse files

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)
  • Loading branch information...
brammool committed Aug 3, 2017
1 parent 01efafa commit 69a76feda9e9d308be6b5fc2185286a061dfecd6
Showing with 32 additions and 0 deletions.
  1. +3 −0 src/misc1.c
  2. +27 −0 src/testdir/test_smartindent.vim
  3. +2 −0 src/version.c
View
@@ -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 */
@@ -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
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
851,
/**/
850,
/**/

0 comments on commit 69a76fe

Please sign in to comment.