summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.vimrc2
-rw-r--r--autoload/plug.vim5
2 files changed, 4 insertions, 3 deletions
diff --git a/.vimrc b/.vimrc
index f674dba..90e4a53 100644
--- a/.vimrc
+++ b/.vimrc
@@ -24,7 +24,7 @@ Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
" Plug 'kchmck/vim-coffee-script', { 'for': 'coffee' }
Plug 'airblade/vim-gitgutter'
-Plug 'maksimr/vim-jsbeautify', { 'for': ['js', 'json'] }
+Plug 'maksimr/vim-jsbeautify', { 'for': ['js', 'json', 'html', 'css', 'scss'] }
Plug 'ngmy/vim-rubocop', { 'for': 'ruby' }
Plug 'elzr/vim-json', { 'for': ['js', 'json'] }
Plug 'honza/vim-snippets'
diff --git a/autoload/plug.vim b/autoload/plug.vim
index ac299a2..a7f1030 100644
--- a/autoload/plug.vim
+++ b/autoload/plug.vim
@@ -442,12 +442,13 @@ function! plug#load(...)
if !exists('g:plugs')
return s:err('plug#begin was not called')
endif
- let unknowns = filter(copy(a:000), '!has_key(g:plugs, v:val)')
+ let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000
+ let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)')
if !empty(unknowns)
let s = len(unknowns) > 1 ? 's' : ''
return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
end
- let unloaded = filter(copy(a:000), '!get(s:loaded, v:val, 0)')
+ let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)')
if !empty(unloaded)
for name in unloaded
call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])