diff options
Diffstat (limited to '')
| -rw-r--r-- | ftplugin/blade.vim | 16 | ||||
| -rw-r--r-- | ftplugin/eelixir.vim | 4 | ||||
| -rw-r--r-- | ftplugin/elixir.vim | 7 | ||||
| -rw-r--r-- | ftplugin/gitrebase.vim | 3 | ||||
| -rw-r--r-- | ftplugin/html.vim | 2 |
5 files changed, 21 insertions, 11 deletions
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim new file mode 100644 index 00000000..501f9667 --- /dev/null +++ b/ftplugin/blade.vim @@ -0,0 +1,16 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1 + +" Vim filetype plugin +" Language: Blade (Laravel) +" Maintainer: Jason Walton <jwalton512@gmail.com> + +if exists('b:did_ftplugin') + finish +endif + +runtime! ftplugin/html.vim +let b:did_ftplugin = 1 + +setlocal iskeyword+=@-@ + +endif diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim index 57c8cb40..b0f3284f 100644 --- a/ftplugin/eelixir.vim +++ b/ftplugin/eelixir.vim @@ -1,9 +1,5 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1 -" Vim filetype plugin -" Language: Embedded Elixir -" URL: https://github.com/elixir-lang/vim-elixir - if exists("b:did_ftplugin") finish endif diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim index 576e4641..04388efd 100644 --- a/ftplugin/elixir.vim +++ b/ftplugin/elixir.vim @@ -1,10 +1,5 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1 -" Vim filetype plugin -" Language: Elixir -" Maintainer: Carlos Galdino <carloshsgaldino@gmail.com> -" URL: https://github.com/elixir-lang/vim-elixir - if (exists("b:did_ftplugin")) finish endif @@ -15,7 +10,7 @@ let b:did_ftplugin = 1 if exists("loaded_matchit") && !exists("b:match_words") let b:match_ignorecase = 0 - let b:match_words = '\<\%(do\|fn\)\:\@!\>' . + let b:match_words = '\:\@<!\<\%(do\|fn\)\:\@!\>' . \ ':' . \ '\<\%(else\|elsif\|catch\|after\|rescue\)\:\@!\>' . \ ':' . diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim index 572a1484..e3e015bb 100644 --- a/ftplugin/gitrebase.vim +++ b/ftplugin/gitrebase.vim @@ -14,10 +14,11 @@ runtime! ftplugin/git.vim let b:did_ftplugin = 1 setlocal comments=:# commentstring=#\ %s formatoptions-=t +setlocal nomodeline if !exists("b:undo_ftplugin") let b:undo_ftplugin = "" endif -let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo<" +let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo< ml<" function! s:choose(word) s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e diff --git a/ftplugin/html.vim b/ftplugin/html.vim index 3546ab2c..782d4015 100644 --- a/ftplugin/html.vim +++ b/ftplugin/html.vim @@ -8,4 +8,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " setlocal iskeyword+=- +setlocal commentstring=<!--%s--> + endif |