diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 01:39:00 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 02:01:25 -0400 |
| commit | e1171cf1d2e4cfb02b5ea1328310612a2e6548ec (patch) | |
| tree | 3d9a06073ae5eb811c5999e4ce69c5be218e0a42 /runtime/indent | |
| parent | d1a2523f6c98f4113e1859830ae448f34d89012c (diff) | |
| download | rneovim-e1171cf1d2e4cfb02b5ea1328310612a2e6548ec.tar.gz rneovim-e1171cf1d2e4cfb02b5ea1328310612a2e6548ec.tar.bz2 rneovim-e1171cf1d2e4cfb02b5ea1328310612a2e6548ec.zip | |
vim-patch:d58a3bf7dac8
Update runtime files.
https://github.com/vim/vim/commit/d58a3bf7dac8d53faf42e13cc1152b110f12c404
Omit syntax/man.vim.
Diffstat (limited to 'runtime/indent')
| -rw-r--r-- | runtime/indent/vim.vim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim index 7b9fa734bc..1303cbab31 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: 2020 Jul 19 +" Last Change: 2020 Sep 27 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -10,7 +10,7 @@ endif let b:did_indent = 1 setlocal indentexpr=GetVimIndent() -setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\,0=\"\\\ +setlocal indentkeys+==end,=},=else,=cat,=finall,=END,0\\,0=\"\\\ setlocal indentkeys-=0# let b:undo_indent = "setl indentkeys< indentexpr<" @@ -93,7 +93,7 @@ function GetVimIndentIntern() else " A line starting with :au does not increment/decrement indent. if prev_text !~ '^\s*au\%[tocmd]' - let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>') + let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)') if i >= 0 let ind += shiftwidth() if strpart(prev_text, i, 1) == '|' && has('syntax_items') @@ -117,7 +117,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\+[eE][nN][dD]\)' + if cur_text =~ '^\s*\(ene\@!\|}\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)' let ind = ind - shiftwidth() endif |