Browse Source

Merge remote branch 'origin/master' into events

Conflicts:
	autoload/vundle/installer.vim
events
gmarik 14 years ago
parent
commit
67d07c9797
5 changed files with 7 additions and 7 deletions
  1. +3
    -3
      README.md
  2. +1
    -1
      autoload/vundle/config.vim
  3. +0
    -1
      autoload/vundle/installer.vim
  4. +2
    -2
      doc/vundle.txt
  5. +1
    -0
      test/vimrc

+ 3
- 3
README.md View File

@ -71,9 +71,9 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details.
## FAQ
- **Q** i'm aked for username/pass, why?
**A** Correct invalid bundle name.
this is the case of invalid name used with `Bundle`, which leads to attemt to clone nonexisting repo:
- **Q** Why am I asked for username/pass?
**A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexisting repo:
git clone http://github.com/gmarik/non_existin_repo
Cloning into non_existin_repo...


+ 1
- 1
autoload/vundle/config.vim View File

@ -46,7 +46,7 @@ endf
func! s:parse_name(arg)
let arg = a:arg
if arg =~? '^\s*\(gh\|github\):\S\+'
\ || arg =~? '^\w[a-z0-9-]\+/[^/]\+$'
\ || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$'
let uri = 'https://github.com/'.split(arg, ':')[-1]
let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i')
elseif arg =~? '^\s*\(git@\|git://\)\S\+'


+ 0
- 1
autoload/vundle/installer.vim View File

@ -104,7 +104,6 @@ func! s:helptags(rtp) abort
helptags `=a:rtp.'/doc/'`
endf
func! vundle#installer#sync(bang, bundle) abort
if a:bundle.nosync() | return a:bang | endif
if a:bundle.installed()


+ 2
- 2
doc/vundle.txt View File

@ -7,7 +7,7 @@ CONTENTS ~
1. About |vundle-about|
2. Why Vundle |vundle-why-vundle|
3. Quick start |vundle-quickstart|
4. Scrips |vundle-scripts|
4. Scripts |vundle-scripts|
4.1. Configure scripts |vundle-scripts-configure|
4.2. Installing scripts |vundle-scripts-install|
4.3. Updating scripts |vundle-scripts-update|
@ -112,7 +112,7 @@ enabled. Except special cases requiring compilation or pre-configuration.
BundleInstall allows to install scripts by name:>
:BundleIntall unite.vim
:BundleInstall unite.vim
installs and activates unite.vim. You can use Tab to auto-complete known script names.
NOTE: installation, as just described, doesn't automatically configure scripts;


+ 1
- 0
test/vimrc View File

@ -75,6 +75,7 @@ Bundle! 'b_plugin', {'name': 'zzz'}
filetype plugin indent on " Automatically detect file types.
set wildignore+=doc " should not break helptags
set wildignore+=.git " should not break clone
augroup vimrc
au WinEnter * call Test()


|||||||
x
 
000:0
Loading…
Cancel
Save