Merge 8db3bcb592 into a97e88917c

README.md

@@ -61,7 +61,7 @@
    Plugin 'tpope/vim-fugitive'
    " plugin from http://vim-scripts.org/vim/scripts.html
    Plugin 'L9'
-   " plugin not on GitHub
+   " Git plugin not hosted on GitHub
    Plugin 'git://git.wincent.com/command-t.git'
    " git repos on your local machine (i.e. when working on your own plugin)
    Plugin 'file:///home/gmarik/path/to/plugin'
@@ -149,10 +149,10 @@ see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributo
 [help tags]:http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags
 [runtime path]:http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27
 
-[configure]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L126-L233
-[install]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L234-L254
-[update]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L255-L265
-[search]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L266-L295
-[clean]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L303-L318
-[interactive mode]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L319-L360
-[interface change]:https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt#L372-L396
+[configure]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
+[install]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
+[update]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
+[search]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
+[clean]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
+[interactive mode]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
+[interface change]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396

autoload/vundle.vim

@@ -2,7 +2,7 @@
 " Author:       gmarik
 " HomePage:     http://github.com/gmarik/Vundle.vim
 " Readme:       http://github.com/gmarik/Vundle.vim/blob/master/README.md
-" Version:      0.10.1
+" Version:      0.10.2
 
 " Plugin Commands
 com! -nargs=+  -bar   Plugin

autoload/vundle/config.vim

@@ -166,15 +166,12 @@ func! s:rtp_add_defaults()
   set rtp&vim
   let default = &rtp
   let &rtp = current
-  for item in reverse(split(default, ','))
-    let item = fnameescape(item)
-    exec 'set rtp-=' . item
-    if fnamemodify(item, ":t") == 'after'
-      exec 'set rtp+=' . item
-    else
-      exec 'set rtp^=' . item
-    endif
-  endfor
+  let default_rtp_items = split(default, ',')
+  if !empty(default_rtp_items)
+    let first_item = fnameescape(default_rtp_items[0])
+    exec 'set rtp-=' . first_item
+    exec 'set rtp^=' . first_item
+  endif
 endf
 
 

autoload/vundle/installer.vim

@@ -331,7 +331,7 @@ endf
 " ---------------------------------------------------------------------------
 func! s:get_current_origin_url(bundle) abort
   let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
-  let cmd = g:shellesc_cd(cmd)
+  let cmd = vundle#installer#shellesc_cd(cmd)
   let out = s:strip(s:system(cmd))
   return out
 endf
@@ -345,7 +345,7 @@ endf
 " ---------------------------------------------------------------------------
 func! s:get_current_sha(bundle)
   let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
-  let cmd = g:shellesc_cd(cmd)
+  let cmd = vundle#installer#shellesc_cd(cmd)
   let out = s:system(cmd)[0:15]
   return out
 endf
@@ -382,7 +382,7 @@ func! s:make_sync_command(bang, bundle) abort
                   \ 'git submodule update --init --recursive',
                   \ ]
       let cmd = join(cmd_parts, ' && ')
-      let cmd = g:shellesc_cd(cmd)
+      let cmd = vundle#installer#shellesc_cd(cmd)
       let initial_sha = ''
       return [cmd, initial_sha]
     endif
@@ -398,7 +398,7 @@ func! s:make_sync_command(bang, bundle) abort
                 \ 'git submodule update --init --recursive',
                 \ ]
     let cmd = join(cmd_parts, ' && ')
-    let cmd = g:shellesc_cd(cmd)
+    let cmd = vundle#installer#shellesc_cd(cmd)
 
     let initial_sha = s:get_current_sha(a:bundle)
   else
@@ -479,7 +479,7 @@ endf
 " cmd    -- the command to be fixed (string)
 " return -- the fixed command (string)
 " ---------------------------------------------------------------------------
-func! g:shellesc_cd(cmd) abort
+func! vundle#installer#shellesc_cd(cmd) abort
   if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
     let cmd = substitute(a:cmd, '^cd ','cd /d ','')  " add /d switch to change drives
     return cmd

autoload/vundle/scripts.vim

@@ -72,7 +72,7 @@ func! s:create_changelog() abort
           \              ' && git log --pretty=format:"%s   %an, %ar" --graph '.
           \               initial_sha.'..'.updated_sha
 
-    let cmd = g:shellesc_cd(cmd)
+    let cmd = vundle#installer#shellesc_cd(cmd)
 
     let updates = system(cmd)
 

changelog.md

@@ -2,6 +2,11 @@ Change Log
 ==========
 F = Feature, B = Bug Fix, D = Doc Change
 
+### Version 0.10.2
+
+- B: #430 Put user script directories before system directories in rtp
+- B: #455 Rename functions that start with `g:` + lowercase letter (Vim patch 7.4.264)
+
 ### Version 0.10.1
 - B: #451 Escape spaces when handling rtp directories
 

doc/vundle.txt

@@ -87,7 +87,7 @@ more information.
     Plugin 'tpope/vim-fugitive'
     " plugin from http://vim-scripts.org/vim/scripts.html
     Plugin 'L9'
-    " plugin not on GitHub
+    " Git plugin not hosted on GitHub
     Plugin 'git://git.wincent.com/command-t.git'
     " git repos on your local machine (i.e. when working on your own plugin)
     Plugin 'file:///home/gmarik/path/to/plugin'
@@ -139,7 +139,7 @@ follow on the same line as the command. Example:
 >
   Plugin 'git_URI'
 
-The `Bundle` command can optionally take a second argument after the URI. It
+The `Plugin` 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.