From a30bedf26cc5d9123cedeab8ee501e82f809a0bf Mon Sep 17 00:00:00 2001
From: Jacobo de Vera <jacobo.devera@qnective.com>
Date: Thu, 20 Mar 2014 09:11:22 +0100
Subject: [PATCH] Make bundle options visible to installer

Bundle configuration options that are inferred from the bundle specs
overwrite user provided ones. This used to prevent users from changing
the name of directory where the cloned bundle should go, for instance.

Keep the user provided options with a preference over inferred ones.
---
 autoload/vundle/config.vim |  2 +-
 doc/vundle.txt             | 31 +++++++++++++++++++++++++++----
 test/vimrc                 |  1 +
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim
index 5bb6e3fc..88a414a2 100644
--- a/autoload/vundle/config.vim
+++ b/autoload/vundle/config.vim
@@ -27,7 +27,7 @@ func! vundle#config#init_bundle(name, opts)
   if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
     echo "Spurious leading and/or trailing whitespace found in bundle spec '" . a:name . "'"
   endif
-  let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')))
+  let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')), 'keep')
   let b = extend(opts, copy(s:bundle))
   let b.rtpath = s:rtpath(opts)
   return b
diff --git a/doc/vundle.txt b/doc/vundle.txt
index 4bc3a5f2..c860d7fc 100644
--- a/doc/vundle.txt
+++ b/doc/vundle.txt
@@ -128,16 +128,39 @@ follow on the same line as the command. Example:
 >
   Bundle 'git_URI'
 
-There can also be a second argument after URI.  It has to be a dictionary with
-a key called 'rtp'.  The value for that key is a directory inside the
-repository (relative path from the root of the repository) where the vim
-plugin resides.  For example:
+The `Bundle` command can optionally take a second argument after the URI. It
+has to be a dictionary, separated from the URI by a comma. Each key-value pair
+in the dictionary is a configuration option.
+
+The following per-script configuration options are available.
+
+The 'rtp' option
+----------------
+
+Specifies a directory inside the repository (relative path from the root of
+the repository) where the vim plugin resides. It determines the path that will
+be added to the |runtimepath|.
+
+For example:
 >
   Bundle 'git_URI', {'rtp': 'some/subdir/'}
 
 This can be used with git repositories that put the vim plugin inside a
 subdirectory.
 
+The 'name' option
+-----------------
+
+The name of the directory that will hold the local clone of the configured
+script.
+
+For example:
+>
+  Bundle 'git_URI', {'name': 'newPluginName'}
+
+This can be used to prevent name collisions between plugins that Vundle would
+otherwise try to clone into the same directory. It also provides an additional
+level of customisation.
 
 3.2 SUPPORTED URIS ~
                                                                 *vundle-uris*
diff --git a/test/vimrc b/test/vimrc
index 546e6dcc..bfaaf32d 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -50,6 +50,7 @@ Bundle '~/Dropbox/.gitrepos/utilz.vim.git'
 
 " with options
 Bundle 'rstacruz/sparkup.git', {'rtp': 'vim/'}
+Bundle 'matchit.zip', {'name': 'matchit'}
 
 " Camel case
 Bundle 'vim-scripts/RubySinatra'