diff options
| author | Ahmed Abdelhalim <[email protected]> | 2018-09-10 09:26:27 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2018-09-10 09:26:27 +0200 |
| commit | ab770eaa8f179d26e28036072500ac9fe74dc033 (patch) | |
| tree | 011c2c8d801d6cb86c6ef028004e3b7266ff36d2 | |
| parent | d981aaa8c5209454ae0fe5e8d00dad328d91d67b (diff) | |
Update plug
| -rw-r--r-- | autoload/plug.vim | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/autoload/plug.vim b/autoload/plug.vim index 52c6b2a..686dd47 100644 --- a/autoload/plug.vim +++ b/autoload/plug.vim @@ -763,6 +763,9 @@ function! s:prepare(...) execute 'silent! unmap <buffer>' k endfor setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell + if exists('+colorcolumn') + setlocal colorcolumn= + endif setf vim-plug if exists('g:syntax_on') call s:syntax() @@ -1008,6 +1011,8 @@ function! s:update_impl(pull, force, args) abort let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' endif + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + " Python version requirement (>= 2.7) if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 redir => pyv @@ -1099,7 +1104,7 @@ function! s:update_finish() if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir) + let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) endif let msg = s:format_message(v:shell_error ? 'x': '-', name, out) if v:shell_error |