Mercurial > dotfiles.old
changeset 213:4e723feac624
Update vimplug
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Tue, 02 Dec 2014 18:06:52 +0100 |
| parents | aba6fdee2489 |
| children | 16e267567c04 |
| files | vim/autoload/plug.vim zsh/exports.zsh |
| diffstat | 2 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/vim/autoload/plug.vim Sat Nov 29 18:25:35 2014 +0100 +++ b/vim/autoload/plug.vim Tue Dec 02 18:06:52 2014 +0100 @@ -752,20 +752,18 @@ call system('rm -rf ' . s:shellesc(g:plugs[name].dir)) endif endfor - let s:jobs = {} - let s:jobs_idx = {} + let s:jobs = {} endfunction -function! s:job_handler() abort +function! s:job_handler(name) abort if !s:plug_window_exists() " plug window closed return s:job_abort() endif - let name = get(s:jobs_idx, v:job_data[0], '') - if empty(name) " stale task + if !has_key(s:jobs, a:name) return endif - let job = s:jobs[name] + let job = s:jobs[a:name] if v:job_data[1] == 'exit' let job.running = 0 @@ -773,14 +771,14 @@ let job.error = 1 let job.result = substitute(job.result, "Error[\r\n]$", '', '') endif - call s:reap(name) + call s:reap(a:name) call s:tick() else let job.result .= s:to_s(v:job_data[2]) " To reduce the number of buffer updates let job.tick = get(job, 'tick', -1) + 1 if job.tick % len(s:jobs) == 0 - call s:log(job.new ? '+' : '*', name, job.result) + call s:log(job.new ? '+' : '*', a:name, job.result) endif endif endfunction @@ -795,10 +793,9 @@ \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) \ . ' || echo Error']) if x > 0 - let s:jobs_idx[x] = a:name let job.jobid = x augroup PlugJobControl - execute 'autocmd JobActivity' a:name 'call s:job_handler()' + execute 'autocmd JobActivity' a:name printf('call s:job_handler(%s)', string(a:name)) augroup END else let job.running = 0 @@ -869,8 +866,7 @@ endfunction function! s:update_vim() - let s:jobs = {} - let s:jobs_idx = {} + let s:jobs = {} call s:bar() call s:tick()