aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/sh.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-01 23:21:22 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-01 23:27:26 +0200
commit532ee54a42a294073e8b441f3ce5a050d16963a2 (patch)
tree9b474891db31d3b920e9c8040cfeb388bf090d75 /runtime/indent/sh.vim
parentf379eac1ef9926ecefab7302f876c7c93b5cca74 (diff)
downloadrneovim-532ee54a42a294073e8b441f3ce5a050d16963a2.tar.gz
rneovim-532ee54a42a294073e8b441f3ce5a050d16963a2.tar.bz2
rneovim-532ee54a42a294073e8b441f3ce5a050d16963a2.zip
vim-patch:a6c27c47ddf0
Update runtime files https://github.com/vim/vim/commit/a6c27c47ddf081859659d7de1caec675147e466b
Diffstat (limited to 'runtime/indent/sh.vim')
-rw-r--r--runtime/indent/sh.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
index 520d3eece1..148a86ed67 100644
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -3,10 +3,12 @@
" Maintainer: Christian Brabandt <cb@256bit.org>
" Original Author: Nikolai Weibull <now@bitwi.se>
" Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
-" Latest Revision: 2019-03-25
+" Latest Revision: 2019-04-27
" License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-sh-indent
" Changelog:
+" 20190428 - De-indent fi correctly when typing with
+" https://github.com/chrisbra/vim-sh-indent/issues/15
" 20190325 - Indent fi; correctly
" https://github.com/chrisbra/vim-sh-indent/issues/14
" 20190319 - Indent arrays (only zsh and bash)
@@ -127,7 +129,7 @@ function! GetShIndent()
" Current line is a endif line, so get indent from start of "if condition" line
" TODO: should we do the same for other "end" lines?
if curline =~ '^\s*\%(fi\);\?\s*\%(#.*\)\=$'
- let previous_line = searchpair('\<if\>', '', '\<fi\>', 'bnW')
+ let previous_line = searchpair('\<if\>', '', '\<fi\>\zs', 'bnW')
if previous_line > 0
let ind = indent(previous_line)
endif