# HG changeset patch # User zegervdv # Date 1417540012 -3600 # Node ID 4e723feac62435fc059389096e666a7dbff71049 # Parent aba6fdee248917419b68f692fcaf2951eef6a9cb Update vimplug diff -r aba6fdee2489 -r 4e723feac624 vim/autoload/plug.vim --- 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() diff -r aba6fdee2489 -r 4e723feac624 zsh/exports.zsh --- a/zsh/exports.zsh Sat Nov 29 18:25:35 2014 +0100 +++ b/zsh/exports.zsh Tue Dec 02 18:06:52 2014 +0100 @@ -39,3 +39,5 @@ export LESS_TERMCAP_ue=$(printf "\e[0m") export LESS_TERMCAP_us=$(printf "\e[1;32m") +export LANGUAGE=$LANG +