From 908662e0660decb2d94072a6d14104a62a3735f8 Mon Sep 17 00:00:00 2001
From: Claus Reinke <whycombinator@gmail.com>
Date: Tue, 31 Mar 2015 20:26:27 +0200
Subject: [PATCH] sort out plugin name registry handling (#509)

- rename s:check_bundle_name to s:register_bundle_name,
  it has the side-effect of updating the bundle name registry
- expand possible return values
- re-registering a plugin name for the same bundle is no conflict
- don't continue processing plugins if registration fails
---
 autoload/vundle/config.vim    | 33 +++++++++++++++++++--------------
 autoload/vundle/installer.vim |  8 +++++---
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim
index 0e02b11..d50a6f8 100644
--- a/autoload/vundle/config.vim
+++ b/autoload/vundle/config.vim
@@ -7,8 +7,8 @@
 " ---------------------------------------------------------------------------
 func! vundle#config#bundle(arg, ...)
   let bundle = vundle#config#init_bundle(a:arg, a:000)
-  if !s:check_bundle_name(bundle)
-    return
+  if 'new'!=s:register_bundle_name(bundle)
+    return {}
   endif
   if exists('g:vundle#lazy_load') && g:vundle#lazy_load
     call add(g:vundle#bundles, bundle)
@@ -84,25 +84,30 @@ endf
 
 
 " ---------------------------------------------------------------------------
-" Check if the current bundle name has already been used in this running
-" instance and show an error to that effect.
+" Check if the current bundle name has already been used by another bundle in
+" this running instance. If bundle name is unique and valid, register it to
+" current bundle, else show an error.
 "
-" bundle -- a bundle object whose name is to be checked
-" return -- 0 if the bundle's name has been seen before, 1 otherwise
+" bundle -- a bundle object whose name is to be checked/registered
+" return -- 'new'|'known'|'collision'|'invalid'
 " ---------------------------------------------------------------------------
-funct! s:check_bundle_name(bundle)
+funct! s:register_bundle_name(bundle)
   if has_key(s:bundle_names, a:bundle.name)
-    echoerr 'Vundle error: Name collision for Plugin ' . a:bundle.name_spec .
-          \ '. Plugin ' . s:bundle_names[a:bundle.name] .
-          \ ' previously used the name "' . a:bundle.name . '"' .
-          \ '. Skipping Plugin ' . a:bundle.name_spec . '.'
-    return 0
+    if s:bundle_names[a:bundle.name]==a:bundle.name_spec
+      return 'known'
+    else
+      echoerr 'Vundle error: Name collision for Plugin ' . a:bundle.name_spec .
+            \ '. Plugin ' . s:bundle_names[a:bundle.name] .
+            \ ' previously used the name "' . a:bundle.name . '"' .
+            \ '. Skipping Plugin ' . a:bundle.name_spec . '.'
+      return 'collision'
+    endif
   elseif a:bundle.name !~ '\v^[A-Za-z0-9_-]%(\.?[A-Za-z0-9_-])*$'
     echoerr 'Invalid plugin name: ' . a:bundle.name
-    return 0
+    return 'invalid'
   endif
   let s:bundle_names[a:bundle.name] = a:bundle.name_spec
-  return 1
+  return 'new'
 endf
 
 
diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim
index 472271a..5dc5852 100644
--- a/autoload/vundle/installer.vim
+++ b/autoload/vundle/installer.vim
@@ -15,7 +15,7 @@ func! vundle#installer#new(bang, ...) abort
     let bundles = filter(copy(g:vundle#bundles), 'index(a:000, v:val.name) > -1')
   " Specific plugins are specified for installation. Install them.
   else
-    let bundles = map(copy(a:000), 'vundle#config#bundle(v:val, {})')
+    let bundles = filter(map(copy(a:000), 'vundle#config#bundle(v:val, {})'),'v:val!={}')
   endif
 
   if empty(bundles)
@@ -150,8 +150,10 @@ endf
 func! vundle#installer#install_and_require(bang, name) abort
   let result = vundle#installer#install(a:bang, a:name)
   let b = vundle#config#bundle(a:name, {})
-  call vundle#installer#helptags([b])
-  call vundle#config#require([b])
+  if b!={}
+    call vundle#installer#helptags([b])
+    call vundle#config#require([b])
+  endif
   return result
 endf