Skip to content

Commit

Permalink
Updating vim stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
askedrelic committed Jan 17, 2017
1 parent 1436089 commit 2df13da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions .vim/autoload/plug.vim
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
" More information: https://github.com/junegunn/vim-plug
"
"
" Copyright (c) 2016 Junegunn Choi
" Copyright (c) 2017 Junegunn Choi
"
" MIT License
"
Expand Down Expand Up @@ -919,7 +919,8 @@ function! s:check_ruby()
endfunction

function! s:update_impl(pull, force, args) abort
let args = copy(a:args)
let sync = index(a:args, '--sync') >= 0 || has('vim_starting')
let args = filter(copy(a:args), 'v:val != "--sync"')
let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
\ remove(args, -1) : get(g:, 'plug_threads', 16)

Expand Down Expand Up @@ -1020,7 +1021,7 @@ function! s:update_impl(pull, force, args) abort
endtry
else
call s:update_vim()
while use_job && has('vim_starting')
while use_job && sync
sleep 100m
if s:update.fin
break
Expand Down Expand Up @@ -2288,7 +2289,12 @@ function! s:preview_commit()
wincmd P
endif
setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
execute 'silent %!cd' s:shellesc(g:plugs[name].dir) '&& git show --no-color --pretty=medium' sha
try
let [sh, shrd] = s:chsh(1)
execute 'silent %!cd' s:shellesc(g:plugs[name].dir) '&& git show --no-color --pretty=medium' sha
finally
let [&shell, &shellredir] = [sh, shrd]
endtry
setlocal nomodifiable
nnoremap <silent> <buffer> q :q<cr>
wincmd p
Expand Down
2 changes: 1 addition & 1 deletion .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ function! Mini_Scripts()
" endfunction
" nmap <leader>w :call <SID>StripTrailingWhitespaces()<cr>

" OSX only: Open a web-browser with the URL in the current line
" OSX only: Open a web-browser with the URL in the current line.
" Funny thing: 'gx' actually does this better, using netrw
function! HandleURI()
let s:uri = matchstr(getline("."), '[a-z]*:\/\/[^ >,;)]*')
Expand Down

0 comments on commit 2df13da

Please sign in to comment.