diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-02-01 21:10:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 21:10:33 -0500 |
| commit | 05081927744f1942dbe49b17dd58e7c3d5f57916 (patch) | |
| tree | 65163934bdd3144bf7b6f234a2e008012f93d20b /runtime/indent/vim.vim | |
| parent | 3803314f7808838fc8c627915878631383ee612d (diff) | |
| parent | 8c09dbf08216b2f3143929f36eaf5e79806980c3 (diff) | |
| download | rneovim-05081927744f1942dbe49b17dd58e7c3d5f57916.tar.gz rneovim-05081927744f1942dbe49b17dd58e7c3d5f57916.tar.bz2 rneovim-05081927744f1942dbe49b17dd58e7c3d5f57916.zip | |
Merge pull request #6045 from jamessan/vim-a02a551
vim-patch:a02a551,802a0d9,e18dbe8,063b9d1
Diffstat (limited to 'runtime/indent/vim.vim')
| -rw-r--r-- | runtime/indent/vim.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim index 7ec7df849e..8ebfa12caf 100644 --- a/runtime/indent/vim.vim +++ b/runtime/indent/vim.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Vim script " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Apr 19 +" Last Change: 2016 Jun 27 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -60,7 +60,7 @@ function GetVimIndentIntern() else let ind = ind + shiftwidth() * 3 endif - elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+[eE][nN][dD]' + elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>' let ind = ind + shiftwidth() else " A line starting with :au does not increment/decrement indent. @@ -89,7 +89,7 @@ function GetVimIndentIntern() " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry, " :endfun, :else and :augroup END. - if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)' + if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)' let ind = ind - shiftwidth() endif |