diff options
Diffstat (limited to 'ftplugin')
| -rw-r--r-- | ftplugin/blade.vim | 4 | ||||
| -rw-r--r-- | ftplugin/coffee.vim | 2 | ||||
| -rw-r--r-- | ftplugin/elixir.vim | 2 | ||||
| -rw-r--r-- | ftplugin/ember-script.vim | 14 | ||||
| -rw-r--r-- | ftplugin/emblem.vim | 8 | ||||
| -rw-r--r-- | ftplugin/ruby.vim | 10 |
6 files changed, 23 insertions, 17 deletions
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim index 501f9667..3d3e7c50 100644 --- a/ftplugin/blade.vim +++ b/ftplugin/blade.vim @@ -11,6 +11,8 @@ endif runtime! ftplugin/html.vim let b:did_ftplugin = 1 -setlocal iskeyword+=@-@ +setlocal suffixesadd=.blade.php,.php +setlocal includeexpr=substitute(v:fname,'\\.','/','g') +setlocal path+=resources/views; endif diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim index 09998268..809c355f 100644 --- a/ftplugin/coffee.vim +++ b/ftplugin/coffee.vim @@ -15,7 +15,7 @@ call coffee#CoffeeSetUpVariables() setlocal formatoptions-=t formatoptions+=croql setlocal comments=:# commentstring=#\ %s setlocal omnifunc=javascriptcomplete#CompleteJS -setlocal suffixesadd+=coffee +setlocal suffixesadd+=.coffee " Create custom augroups. augroup CoffeeBufUpdate | augroup END diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim index 225e2772..807d0665 100644 --- a/ftplugin/elixir.vim +++ b/ftplugin/elixir.vim @@ -56,6 +56,6 @@ let &l:path = setlocal includeexpr=GetElixirFilename(v:fname) setlocal suffixesadd=.ex,.exs,.eex,.erl,.yrl,.hrl -setlocal formatoptions-=t formatoptions+=croqlj +silent! setlocal formatoptions-=t formatoptions+=croqlj endif diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim index a352a86d..1e6c12a9 100644 --- a/ftplugin/ember-script.vim +++ b/ftplugin/ember-script.vim @@ -1,10 +1,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1 " Language: ember-script -" Maintainer: heartsentwined <heartsentwined@cogito-lab.com> -" URL: http://github.com/heartsentwined/vim-ember-script -" Version: 1.0.1 -" Last Change: 2013 Apr 17 +" Maintainer: Yulij Andreevich Lesov <yalesov@gmail.com>> +" URL: http://github.com/yalesov/vim-ember-script +" Version: 1.0.3 +" Last Change: 2016 Jul 5 " License: GPL-3.0 setlocal tabstop=2 @@ -14,7 +14,11 @@ setlocal smarttab setlocal expandtab setlocal smartindent -setlocal formatoptions-=t formatoptions+=croqlj +if v:version < 703 + setlocal formatoptions-=t formatoptions+=croql +else + setlocal formatoptions-=t formatoptions+=croqlj +endif setlocal comments=:# setlocal commentstring=#\ %s diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim index 8432f413..230fba98 100644 --- a/ftplugin/emblem.vim +++ b/ftplugin/emblem.vim @@ -1,10 +1,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1 " Language: emblem -" Maintainer: heartsentwined <heartsentwined@cogito-lab.com> -" URL: http://github.com/heartsentwined/vim-emblem -" Version: 1.2.0 -" Last Change: 2013 Apr 22 +" Maintainer: Yulij Andreevich Lesov <yalesov@gmail.com> +" URL: http://github.com/yalesov/vim-emblem +" Version: 2.0.0 +" Last Change: 2016 Jul 5 " License: GPL-3.0 setlocal tabstop=2 diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim index 786bb7c8..1969658d 100644 --- a/ftplugin/ruby.vim +++ b/ftplugin/ruby.vim @@ -77,20 +77,20 @@ function! s:query_path(root) abort let prefix = '' endif if &shellxquote == "'" - let path_check = prefix.'ruby -e "' . code . '"' + let path_check = prefix.'ruby -e --disable-gems"' . code . '"' else - let path_check = prefix."ruby -e '" . code . "'" + let path_check = prefix."ruby -e --disable-gems'" . code . "'" endif let cd = haslocaldir() ? 'lcd' : 'cd' - let cwd = getcwd() + let cwd = fnameescape(getcwd()) try exe cd fnameescape(a:root) let path = split(system(path_check),',') - exe cd fnameescape(cwd) + exe cd cwd return path finally - exe cd fnameescape(cwd) + exe cd cwd endtry endfunction |