diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-06-19 23:59:39 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-07-08 01:38:21 -0400 |
| commit | 28300a1293b17072c1c5f053a55aae2268454246 (patch) | |
| tree | 30696c31e5fc18d88ee1712128b78f3218acc82c /runtime/indent | |
| parent | 562b17260fb1eafe5e49412997bc81de29d24ccb (diff) | |
| download | rneovim-28300a1293b17072c1c5f053a55aae2268454246.tar.gz rneovim-28300a1293b17072c1c5f053a55aae2268454246.tar.bz2 rneovim-28300a1293b17072c1c5f053a55aae2268454246.zip | |
vim-patch:f391327
Updated runtime files.
https://github.com/vim/vim/commit/f391327adbbffb11180cf6038a92af1ed144e907
Ignore changes to
* doc/todo.txt: Irrelevant for Neovim
* doc/channel.txt: Channel docs
* doc/tags, syntax/vim.vim: Generated at build time
Diffstat (limited to 'runtime/indent')
| -rw-r--r-- | runtime/indent/sh.vim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim index 2d603b0afa..d05bb3770f 100644 --- a/runtime/indent/sh.vim +++ b/runtime/indent/sh.vim @@ -3,7 +3,7 @@ " Maintainer: Christian Brabandt <cb@256bit.org> " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> " Original Author: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2016-01-15 +" Latest Revision: 2016-02-15 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-sh-indent @@ -12,14 +12,14 @@ if exists("b:did_indent") endif let b:did_indent = 1 -let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<' - setlocal indentexpr=GetShIndent() setlocal indentkeys+=0=then,0=do,0=else,0=elif,0=fi,0=esac,0=done,0=end,),0=;;,0=;& setlocal indentkeys+=0=fin,0=fil,0=fip,0=fir,0=fix setlocal indentkeys-=:,0# setlocal nosmartindent +let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<' + if exists("*GetShIndent") finish endif @@ -67,7 +67,7 @@ function! GetShIndent() if !s:is_case_ended(line) let ind += s:indent_value('case-statements') endif - elseif line =~ '^\s*\<\k\+\>\s*()\s*{' || line =~ '^\s*{' + elseif line =~ '^\s*\<\k\+\>\s*()\s*{' || line =~ '^\s*{' || line =~ '^\s*function\s*\w\S\+\s*\%(()\)\?\s*{' if line !~ '}\s*\%(#.*\)\=$' let ind += s:indent_value('default') endif |