Merge branch 'master' into windows

This commit is contained in:
gmarik 2011-04-03 16:02:07 -05:00
commit 2624232f73
4 changed files with 16 additions and 9 deletions

View File

@ -45,10 +45,10 @@ func! s:parse_name(arg)
let uri = 'https://github.com/'.split(arg, ':')[-1] let uri = 'https://github.com/'.split(arg, ':')[-1]
let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i') let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i')
elseif arg =~ '^\s*\(git@\|git://\)\S\+' elseif arg =~ '^\s*\(git@\|git://\)\S\+'
\ || arg =~ 'https\?://' \ || arg =~ '(file|https\?)://'
\ || arg =~ '\.git\s*$' \ || arg =~ '\.git\s*$'
let uri = arg let uri = arg
let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i') let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1]
else else
let name = arg let name = arg
let uri = 'https://github.com/vim-scripts/'.name.'.git' let uri = 'https://github.com/vim-scripts/'.name.'.git'

View File

@ -8,10 +8,10 @@ func! vundle#installer#install(bang, ...)
redraw! redraw!
call vundle#config#require(bundles) call vundle#config#require(bundles)
call s:log("Installed bundles:\n".join((len(installed) == 0 ? ['no new bundless installed'] : map(installed, 'v:val.name')),"\n")) call s:log("Installed bundles:\n".join((empty(installed) ? ['no new bundless installed'] : map(installed, 'v:val.name')),"\n"))
let help_dirs = vundle#installer#helptags(bundles) let help_dirs = vundle#installer#helptags(bundles)
if len(help_dirs) > 0 if !empty(help_dirs)
call s:log('Helptags: done. '.len(help_dirs).' bundles processed') call s:log('Helptags: done. '.len(help_dirs).' bundles processed')
endif endif
endf endf
@ -49,7 +49,7 @@ endf
func! s:has_doc(rtp) func! s:has_doc(rtp)
return isdirectory(a:rtp.'/doc') return isdirectory(a:rtp.'/doc')
\ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags')) \ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags'))
\ && (len(glob(a:rtp.'/doc/*.txt')) > 0 || len(glob(a:rtp.'/doc/*.??x')) > 0) \ && !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x')))
endf endf
func! s:helptags(rtp) func! s:helptags(rtp)

View File

@ -25,7 +25,12 @@ func! vundle#scripts#complete(a,c,d)
endf endf
func! vundle#scripts#install() abort func! vundle#scripts#install() abort
let line = substitute(substitute(getline('.'), '\s*Bundle\s*','','g'), "'",'','g') let l = getline('.')
if l !~ '^Bundle '
echohl Error | echo 'Select Bundle to install'| echohl None
return 0
end
let line = substitute(substitute(l, '\s*Bundle\s*','','g'), "'",'','g')
call vundle#installer#install(0, line) call vundle#installer#install(0, line)
endf endf

View File

@ -84,7 +84,7 @@ command in `.vimrc`: >
or > or >
Bundle 'script_name' " 'script-name' should be an official script name (see |vundle-scripts-search| ) Bundle 'script_name' " 'script-name' should be an official script name (see |vundle-scripts-search| )
Vundle loves Github, that's why short uris can be used to configure bundles: > Vundle loves Github, that's why short uris can be used with commands: >
Bundle 'tpope/vim-fugitive' Bundle 'tpope/vim-fugitive'
@ -92,6 +92,8 @@ equals full uri >
Bundle 'http://github.com/tpope/vim-fugitive.git' Bundle 'http://github.com/tpope/vim-fugitive.git'
NOTE: Vundle defaults to http:// protocol for the short URIs
4.2 INSTALL SCRIPTS ~ 4.2 INSTALL SCRIPTS ~
*vundle-scripts-install* *BundleInstall* *vundle-scripts-install* *BundleInstall*
@ -158,11 +160,11 @@ removes unused scripts with no questions.
5. INTERACTIVE MODE ~ 5. INTERACTIVE MODE ~
Vundle provides simple interactive mode to help you explore new scripts easily. Vundle provides simple interactive mode to help you explore new scripts easily.
Interactive mode is available as result of :Bundles command. For instance running > Interactive mode is available as result of :Bundles command. For instance, running: >
:Bundles! unite :Bundles! unite
searches for scripts matching 'unite' string and yields a split window with triggers search for scripts matching 'unite' and yields a split window with
content: > content: >
"Keymap: i - Install bundle; c - Cleanup; r - Refine list; R - Reload list "Keymap: i - Install bundle; c - Cleanup; r - Refine list; R - Reload list