diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-11-07 20:43:11 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-11-07 23:07:03 +0100 |
| commit | 4175dfac9a91e30d01e5aec6b45ed81e0288aaf9 (patch) | |
| tree | 066a1dc529d281003252d43cbd97b0a3bd835115 /runtime/indent | |
| parent | ea51f08276ce7c9386b88b320fd63ae71324351a (diff) | |
| download | rneovim-4175dfac9a91e30d01e5aec6b45ed81e0288aaf9.tar.gz rneovim-4175dfac9a91e30d01e5aec6b45ed81e0288aaf9.tar.bz2 rneovim-4175dfac9a91e30d01e5aec6b45ed81e0288aaf9.zip | |
vim-patch:01164a6546b4
Long overdue runtime update.
https://github.com/vim/vim/commit/01164a6546b4c635daf96a1f17d1cb2d07f32a66
Diffstat (limited to 'runtime/indent')
| -rw-r--r-- | runtime/indent/gitolite.vim | 10 | ||||
| -rw-r--r-- | runtime/indent/vhdl.vim | 17 |
2 files changed, 16 insertions, 11 deletions
diff --git a/runtime/indent/gitolite.vim b/runtime/indent/gitolite.vim index 2d24b592d0..b36f30a494 100644 --- a/runtime/indent/gitolite.vim +++ b/runtime/indent/gitolite.vim @@ -1,8 +1,10 @@ " Vim indent file " Language: gitolite configuration -" URL: https://github.com/tmatilai/gitolite.vim -" Maintainer: Teemu Matilainen <teemu.matilainen@iki.fi> -" Last Change: 2017 Jun 13 +" URL: https://github.com/sitaramc/gitolite/blob/master/contrib/vim/indent/gitolite.vim +" (https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/indent/gitolite.vim) +" Maintainer: Sitaram Chamarty <sitaramc@gmail.com> +" (former Maintainer: Teemu Matilainen <teemu.matilainen@iki.fi>) +" Last Change: 2017 Oct 05 if exists("b:did_indent") finish @@ -30,6 +32,8 @@ function! GetGitoliteIndent() return shiftwidth() elseif cline =~ '^\s*config\s' return shiftwidth() + elseif cline =~ '^\s*option\s' + return shiftwidth() elseif pline =~ '^\s*repo\s' && cline =~ '^\s*\(#.*\)\?$' return shiftwidth() elseif cline =~ '^\s*#' diff --git a/runtime/indent/vhdl.vim b/runtime/indent/vhdl.vim index 7c3956035e..ad318066f4 100644 --- a/runtime/indent/vhdl.vim +++ b/runtime/indent/vhdl.vim @@ -1,8 +1,8 @@ " VHDL indent ('93 syntax) " Language: VHDL " Maintainer: Gerald Lai <laigera+vim?gmail.com> -" Version: 1.60 -" Last Change: 2017 Jun 13 +" Version: 1.62 +" Last Change: 2017 Oct 17 " URL: http://www.vim.org/scripts/script.php?script_id=1450 " only load this indent file when no other was loaded @@ -412,11 +412,12 @@ function GetVHDLindent() " **************************************************************************************** " indent: maintain indent of previous opening statement - " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$ + " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + "in", "out", "inout", "buffer", "linkage", variable & ":=" " where: start of current line - if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$' + if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\w\+\s\+:=\)' return ind2 endif + " **************************************************************************************** " indent: maintain indent of previous opening statement, corner case which " does not end in ;, but is part of a mapping @@ -424,10 +425,10 @@ function GetVHDLindent() " prevline without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$ " where: start of current line if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*[^;].*$' - if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$' - return ind2 - endif - endif + if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$' + return ind2 + endif + endif " return leftover filtered indent return ind |