From 286abd12f26d108fd76e9ea626ff4c0bcdcd1b06 Mon Sep 17 00:00:00 2001 From: Matthew Vance Date: Sat, 26 Apr 2014 21:02:05 -0300 Subject: [PATCH 1/6] Clarified comment for non GitHub example in Configure bundles --- README.md | 2 +- doc/vundle.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 05096b0..7f25cab 100644 --- a/README.md +++ b/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' diff --git a/doc/vundle.txt b/doc/vundle.txt index 8f310cd..63c0b1c 100644 --- a/doc/vundle.txt +++ b/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' From 0afe058353b891c592758d2863ca9f47a70588cf Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Fri, 25 Apr 2014 11:30:50 +0200 Subject: [PATCH 2/6] change function g:shellesc_cd into vundle#installer#shellesc_cd --- autoload/vundle/installer.vim | 10 +++++----- autoload/vundle/scripts.vim | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index dd8247b..614b64b 100644 --- a/autoload/vundle/installer.vim +++ b/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 diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 2129903..d7409a1 100644 --- a/autoload/vundle/scripts.vim +++ b/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) From a9176778795147b3c7f30a2d18424df224d7f29d Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Fri, 25 Apr 2014 22:33:13 +0200 Subject: [PATCH 3/6] Limit default rtp rearrangement Rearranging rtp so that **all** default directories appear first has the undesired side effect of not allowing plugins to override default syntax files. This changeset limits the rearrangement of the rtp to simply making sure the first directory in the default runtimepath appears first in also in the runtimepath after Vundle has finished manipulating it. This should keep the original bugs fixed and should eliminate the aforementioned undesired side effect. Fixes #430 Fixes #456 --- autoload/vundle/config.vim | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 46d694e..5ecb30b 100644 --- a/autoload/vundle/config.vim +++ b/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 From 40e23f79f137a86c1deb3371e9955ce238054e36 Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Mon, 28 Apr 2014 15:52:41 +0200 Subject: [PATCH 4/6] Bump version to 0.10.2 --- README.md | 14 +++++++------- autoload/vundle.vim | 2 +- changelog.md | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7f25cab..b8a7fdb 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/autoload/vundle.vim b/autoload/vundle.vim index efd8156..2939048 100644 --- a/autoload/vundle.vim +++ b/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 diff --git a/changelog.md b/changelog.md index 8c3a36e..20c645b 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,11 @@ Change Log ========== F = Feature, B = Bug Fix, D = Doc Change +### Version 0.10.1 + +- 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 From c46dc75e3c4b17c49d018e720721fe76f6225640 Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Mon, 28 Apr 2014 17:49:47 +0200 Subject: [PATCH 5/6] Correct new version in changelog.md --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 20c645b..b620840 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,7 @@ Change Log ========== F = Feature, B = Bug Fix, D = Doc Change -### Version 0.10.1 +### 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) From 8db3bcb5921103f0eb6de361c8b25cc03cb350b5 Mon Sep 17 00:00:00 2001 From: Andrea Cedraro Date: Sat, 26 Apr 2014 15:29:33 +0200 Subject: [PATCH 6/6] Change reference of `Bundle` to `Plugin` in the docs --- doc/vundle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/vundle.txt b/doc/vundle.txt index 63c0b1c..198584b 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -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.