diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-06-05 02:20:38 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-05 08:20:38 +0200 |
| commit | b2633bba732a4ddd8f847b2bd445e53f93fa5d60 (patch) | |
| tree | ef6d8e02b508887288bf031bb15cba7326801a15 /src/nvim/misc1.c | |
| parent | cf92a76285f7bc3823ea45c4ced9085a4fe8e362 (diff) | |
| download | rneovim-b2633bba732a4ddd8f847b2bd445e53f93fa5d60.tar.gz rneovim-b2633bba732a4ddd8f847b2bd445e53f93fa5d60.tar.bz2 rneovim-b2633bba732a4ddd8f847b2bd445e53f93fa5d60.zip | |
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)
Diffstat (limited to 'src/nvim/misc1.c')
| -rw-r--r-- | src/nvim/misc1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 28455f0ba9..dc59aa1281 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -106,7 +106,8 @@ open_line ( char_u *p; char_u saved_char = NUL; // init for GCC pos_T *pos; - bool do_si = (!p_paste && curbuf->b_p_si && !curbuf->b_p_cin); + bool do_si = (!p_paste && curbuf->b_p_si && !curbuf->b_p_cin + && *curbuf->b_p_inde == NUL); bool no_si = false; // reset did_si afterwards int first_char = NUL; // init for GCC int vreplace_mode; |