diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2019-03-29 20:30:36 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2019-03-29 20:30:36 +0100 |
| commit | a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5 (patch) | |
| tree | 0ec7670cabfdf1b5fa3545cee9ee9d6ca7c8ad32 /ftplugin | |
| parent | 1d45a6d4f094127b113470d7710695b280224933 (diff) | |
| download | vim-polyglot-a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5.tar.gz vim-polyglot-a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5.zip | |
Remove grapqhl, fixes #387v3.7.1
Diffstat (limited to 'ftplugin')
| -rw-r--r-- | ftplugin/gitcommit.vim | 6 | ||||
| -rw-r--r-- | ftplugin/graphql.vim | 22 | ||||
| -rw-r--r-- | ftplugin/ruby.vim | 6 | ||||
| -rw-r--r-- | ftplugin/terraform.vim | 2 |
4 files changed, 8 insertions, 28 deletions
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim index 177beef2..3eb77a67 100644 --- a/ftplugin/gitcommit.vim +++ b/ftplugin/gitcommit.vim @@ -17,8 +17,10 @@ let b:did_ftplugin = 1 setlocal comments=:# commentstring=#\ %s setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72 -setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q -let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms<' +setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q formatoptions+=n +setlocal formatlistpat+=\\\|^\\s*[-*+]\\s\\+ + +let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms< formatlistpat<' if exists("g:no_gitcommit_commands") || v:version < 700 finish diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim deleted file mode 100644 index 7734acee..00000000 --- a/ftplugin/graphql.vim +++ /dev/null @@ -1,22 +0,0 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1 - finish -endif - -" Vim filetype plugin -" Language: GraphQL -" Maintainer: Jon Parise <jon@indelible.org> - -if (exists('b:did_ftplugin')) - finish -endif -let b:did_ftplugin = 1 - -setlocal comments=:# -setlocal commentstring=#\ %s -setlocal formatoptions-=t -setlocal iskeyword+=$,@-@ -setlocal softtabstop=2 -setlocal shiftwidth=2 -setlocal expandtab - -let b:undo_ftplugin = 'setlocal com< cms< fo< isk< sts< sw< et<' diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim index 316a7296..cc97760a 100644 --- a/ftplugin/ruby.vim +++ b/ftplugin/ruby.vim @@ -27,13 +27,13 @@ if exists("loaded_matchit") && !exists("b:match_words") let b:match_ignorecase = 0 let b:match_words = - \ '\<\%(if\|unless\|case\|while\|until\|for\|do\|class\|module\|def\|=\@<!begin\)\>=\@!' . + \ '{\|\<\%(if\|unless\|case\|while\|until\|for\|do\|class\|module\|def\|=\@<!begin\)\>=\@!' . \ ':' . \ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' . \ ':' . - \ '\%(^\|[^.\:@$=]\)\@<=\<end\:\@!\>' . + \ '}\|\%(^\|[^.\:@$=]\)\@<=\<end\:\@!\>' . \ ',^=begin\>:^=end\>,' . - \ ',{:},\[:\],(:)' + \ ',\[:\],(:)' let b:match_skip = \ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" . diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim index e577c737..0ece8bf6 100644 --- a/ftplugin/terraform.vim +++ b/ftplugin/terraform.vim @@ -12,7 +12,7 @@ if exists("g:loaded_terraform") || v:version < 700 || &cp || !executable('terraf endif let g:loaded_terraform = 1 -if !exists("g:terraform_fmt_on_save") +if !exists("g:terraform_fmt_on_save") || !filereadable(expand("%:p")) let g:terraform_fmt_on_save = 0 endif |