From 928b3bf2dc60ed43f0c611f9042b634c10a3f303 Mon Sep 17 00:00:00 2001 From: Chris Blunt Date: Fri, 2 Dec 2011 13:32:53 +0000 Subject: [PATCH 01/50] Updated readme to use "tpope/vim-rails.git" repository. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a88f21..eb0fd75 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,10 @@ Bundle 'tpope/vim-fugitive' Bundle 'Lokaltog/vim-easymotion' Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} + Bundle 'tpope/vim-rails.git' " vim-scripts repos Bundle 'L9' Bundle 'FuzzyFinder' - Bundle 'rails.vim' " non github repos Bundle 'git://git.wincent.com/command-t.git' " ... From 162b1bdd4fe3529e41c9ffba03a8adbd13087af9 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 18 Dec 2011 03:16:41 -0600 Subject: [PATCH 02/50] treat transcient bundles as configured - "transcient bundle" - a bundle installed with :BundleInstall or interactively without being declared in .vimrc - treat them the as if they were configured - so everything works the same - ie before this change helptags weren't generated automatically with `BundleInstall bundle` or with interactive mode - it changes the way `:BundleClean` works, since it removes directories that aren't bundles - FIX: `:source .vimrc` to let `:BundleClean` remove transcient bundles - closes #99 --- autoload/vundle/config.vim | 1 + autoload/vundle/installer.vim | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 86756d2..b4578e4 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -3,6 +3,7 @@ func! vundle#config#bundle(arg, ...) call s:rtp_rm_a() call add(g:bundles, bundle) call s:rtp_add_a() + return bundle endf func! vundle#config#init() diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index a086e32..30ac136 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -1,7 +1,7 @@ func! vundle#installer#new(bang, ...) abort let bundles = (a:1 == '') ? \ g:bundles : - \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') + \ map(copy(a:000), 'vundle#config#bundle(v:val, {})') let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec')) call vundle#scripts#view('Installer',['" Installing bundles to '.expand(g:bundle_dir, 1)], names + ['Helptags']) @@ -83,7 +83,8 @@ endf func! vundle#installer#install_and_require(bang, name) abort let result = vundle#installer#install(a:bang, a:name) - let b = vundle#config#init_bundle(a:name, {}) + let b = vundle#config#bundle(a:name, {}) + call vundle#installer#helptags([b]) call vundle#config#require([b]) return result endf From 877d03bf8da55116b129f7ba53ebe6ab9640b300 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 20 Dec 2011 02:21:17 -0600 Subject: [PATCH 03/50] Docs: wording --- doc/vundle.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/vundle.txt b/doc/vundle.txt index 3b347ce..d58b0a6 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -159,7 +159,7 @@ Searching requires [`curl`](http://curl.haxx.se/) 4.5 LISTING BUNDLES ~ *vundle-scripts-list* *BundleList* -To quickly pull list of configured bundles use > +To quickly pull list of installed bundles use > :BundleList @@ -170,13 +170,13 @@ run > :BundleClean -requires confirmation before removal of unused script-dirs from your `.vim/bundle`. +confirms removal of unused script-dirs from `.vim/bundle/`. *BundleClean!* > :BundleClean! -removes unused scripts with no questions. +removes unused dirs with no questions. *vundle-interactive* From 3e7b39fe52a63665c0d5da68331d75afb0088ed1 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 24 Oct 2011 20:49:44 -0500 Subject: [PATCH 04/50] introduce g:vundle_default_git_proto option - use `let g:vundle_default_git_proto = 'git'` to set default protocol to build URIs to clone from --- autoload/vundle/config.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index b4578e4..6ee86a6 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -41,10 +41,11 @@ endf func! s:parse_name(arg) let arg = a:arg + let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'http' if arg =~? '^\s*\(gh\|github\):\S\+' \ || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$' - let uri = 'https://github.com/'.split(arg, ':')[-1] + let uri = git_proto.'://github.com/'.split(arg, ':')[-1] if uri !~? '\.git$' let uri .= '.git' endif @@ -56,7 +57,7 @@ func! s:parse_name(arg) let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1] else let name = arg - let uri = 'https://github.com/vim-scripts/'.name.'.git' + let uri = git_proto.'://github.com/vim-scripts/'.name.'.git' endif return {'name': name, 'uri': uri, 'name_spec': arg } endf From ecb6773c942f365e432caeaace6b9ed05a377c16 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 24 Oct 2011 21:09:01 -0500 Subject: [PATCH 05/50] update test/vimrc with proto default --- test/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/vimrc b/test/vimrc index 0b31627..c908e42 100644 --- a/test/vimrc +++ b/test/vimrc @@ -19,6 +19,7 @@ runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' call vundle#rc(root) +" let g:vundle_default_git_proto = 'git' Bundle "gmarik/vundle" From f6ce31fa380bb73f8d443881c696226337eb0020 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 20 Dec 2011 03:07:12 -0600 Subject: [PATCH 06/50] https is a default proto - as `http` one just redirects to `https` on GitHub --- autoload/vundle/config.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 6ee86a6..ee1e42b 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -41,7 +41,7 @@ endf func! s:parse_name(arg) let arg = a:arg - let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'http' + let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'https' if arg =~? '^\s*\(gh\|github\):\S\+' \ || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$' From 6f7c6d33e8868e4ca86b66934e6c25d609a78ea1 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 20 Dec 2011 03:25:33 -0600 Subject: [PATCH 07/50] Docs: add g:vundle_default_git_proto option --- doc/vundle.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/vundle.txt b/doc/vundle.txt index d58b0a6..3049fc9 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -16,6 +16,7 @@ CONTENTS ~ 4.6. Cleanup |vundle-scripts-cleanup| 5. Interactive mode |vundle-interactive| 6. Key mappings |vundle-keymappings| +7. Options |vundle-options| =========================================================================== @@ -219,6 +220,15 @@ KEY | DESCRIPTION c | run :BundleClean s | run :BundleSearch R | fetch fresh script list from server +. + + *vundle-options* +7. OPTIONS ~ + +> + let g:vundle_default_git_proto = 'git' + +makes Vundle use `git` instead default `https` when building absolute repo URIs vim:tw=78:ts=8:ft=help:norl: From de961782d3eac9e8b0d3eabc7154daba876bda37 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 20 Dec 2011 03:26:15 -0600 Subject: [PATCH 08/50] test/vimrc update --- test/vimrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/vimrc b/test/vimrc index c908e42..bb1451d 100644 --- a/test/vimrc +++ b/test/vimrc @@ -5,8 +5,12 @@ set nowrap let root = '/tmp/!vundle-test/bundles/' let src = 'http://github.com/gmarik/vundle.git' + " let src = '~/.vim/bundle/vundle/.git' +" Vundle Options +" let g:vundle_default_git_proto = 'git' + if !isdirectory(expand(root, 1).'/vundle') exec '!git clone '.src.' '.shellescape(root, 1).'/vundle' endif @@ -19,7 +23,6 @@ runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' call vundle#rc(root) -" let g:vundle_default_git_proto = 'git' Bundle "gmarik/vundle" From 67640fc68b29aed700afd35f38a1f05b280e01b8 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 20 Dec 2011 03:49:06 -0600 Subject: [PATCH 09/50] README: donations --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb0fd75..b7d4265 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ 4. Consider [donating](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=T44EJZX8RBUWY) -*Thank you* for supporting this project! ) +[*Thank you*](http://j.mp/rSbm01) for supporting this project! ) ## Why Vundle From 31f886f75b66021f1b40b1705150802783fdd92e Mon Sep 17 00:00:00 2001 From: Bryan English Date: Sat, 14 Jan 2012 01:15:59 -0800 Subject: [PATCH 10/50] Added .gitignore file so as to play nicely as a git submodule. --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..926ccaa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +doc/tags From b6071db7a54c9713c863f3db04d37e8d3b90cb63 Mon Sep 17 00:00:00 2001 From: Sam Lidder Date: Sat, 14 Jan 2012 16:06:00 -0500 Subject: [PATCH 11/50] make calls to glob* compatible with vim 7.1 --- autoload/vundle/installer.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 30ac136..0f71ebf 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -126,7 +126,7 @@ endf func! vundle#installer#clean(bang) abort let bundle_dirs = map(copy(g:bundles), 'v:val.path()') - let all_dirs = split(globpath(g:bundle_dir, '*', 1), "\n") + let all_dirs = v:version >= 702 ? split(globpath(g:bundle_dir, '*', 1), "\n") : split(globpath(g:bundle_dir, '*'), "\n") let x_dirs = filter(all_dirs, '0 > index(bundle_dirs, v:val)') if empty(x_dirs) @@ -179,7 +179,9 @@ endf func! s:has_doc(rtp) abort return isdirectory(a:rtp.'/doc') \ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags')) - \ && !(empty(glob(a:rtp.'/doc/*.txt', 1)) && empty(glob(a:rtp.'/doc/*.??x', 1))) + \ && v:version >= 702 + \ ? !(empty(glob(a:rtp.'/doc/*.txt', 1)) && empty(glob(a:rtp.'/doc/*.??x', 1))) + \ : !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x'))) endf func! s:helptags(rtp) abort From c9d81623c33febf0111de9df3d2065c56803a549 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 15 Jan 2012 02:26:02 -0600 Subject: [PATCH 12/50] note on how to :BundleInstall from CLI --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b7d4265..235a966 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,8 @@ 3. Install configured bundles: - Launch `vim`, run `:BundleInstall`. + Launch `vim`, run `:BundleInstall` + (or `vim +BundleInstall +qall` for CLI lovers) *Windows users* see [Vundle for Windows](https://github.com/gmarik/vundle/wiki/Vundle-for-Windows) From d9578d0c0d5e34b6a080215a917e22c2eef169e1 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Thu, 2 Feb 2012 15:21:20 +0900 Subject: [PATCH 13/50] fix Setup, not using HTTP but HTTPS --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 235a966..d81e042 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ 1. Setup [Vundle]: ``` - $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + $ git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle ``` 2. Configure bundles: From 1fce719532187aab5c83ab9cd3e5a675edc54201 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 28 Jan 2012 18:05:21 -0600 Subject: [PATCH 14/50] make rtpath an attribute - having it as a function makes it slower --- autoload/vundle/config.vim | 17 ++++++++++------- autoload/vundle/installer.vim | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index ee1e42b..fd80cff 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -14,7 +14,7 @@ endf func! vundle#config#require(bundles) abort for b in a:bundles - call s:rtp_add(b.rtpath()) + call s:rtp_add(b.rtpath) call s:rtp_add(g:bundle_dir) " TODO: it has to be relative rtpath, not bundle.name exec 'runtime! '.b.name.'/plugin/*.vim' @@ -25,7 +25,9 @@ endf func! vundle#config#init_bundle(name, opts) let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g'))) - return extend(opts, copy(s:bundle)) + let b = extend(opts, copy(s:bundle)) + let b.rtpath = s:rtpath(opts) + return b endf func! s:parse_options(opts) @@ -63,11 +65,11 @@ func! s:parse_name(arg) endf func! s:rtp_rm_a() - call filter(copy(g:bundles), 's:rtp_rm(v:val.rtpath())') + call filter(copy(g:bundles), 's:rtp_rm(v:val.rtpath)') endf func! s:rtp_add_a() - call filter(reverse(copy(g:bundles)), 's:rtp_add(v:val.rtpath())') + call filter(reverse(copy(g:bundles)), 's:rtp_add(v:val.rtpath)') endf func! s:rtp_rm(dir) abort @@ -84,12 +86,13 @@ func! s:expand_path(path) abort return simplify(expand(a:path, 1)) endf +func! s:rtpath(opts) + return has_key(a:opts, 'rtp') ? s:expand_path(a:opts.path().'/'.a:opts.rtp) : a:opts.path() +endf + let s:bundle = {} func! s:bundle.path() return s:expand_path(g:bundle_dir.'/'.self.name) endf -func! s:bundle.rtpath() - return has_key(self, 'rtp') ? s:expand_path(self.path().'/'.self.rtp) : self.path() -endf diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 0f71ebf..e2a8291 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -103,7 +103,7 @@ func! vundle#installer#docs() abort endf func! vundle#installer#helptags(bundles) abort - let bundle_dirs = map(copy(a:bundles),'v:val.rtpath()') + let bundle_dirs = map(copy(a:bundles),'v:val.rtpath') let help_dirs = filter(bundle_dirs, 's:has_doc(v:val)') call s:log('') From 5b0bb1375d324864715e3f6e5d4454b43abe0ebb Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 28 Jan 2012 19:54:03 -0600 Subject: [PATCH 15/50] inline loop - also work in batches --- autoload/vundle/config.vim | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index fd80cff..55c7d7d 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -65,11 +65,19 @@ func! s:parse_name(arg) endf func! s:rtp_rm_a() - call filter(copy(g:bundles), 's:rtp_rm(v:val.rtpath)') + let paths = map(copy(g:bundles), 'v:val.rtpath') + let prepends = join(paths, ',') + let appends = join(paths, '/after,').'/after' + exec 'set rtp-='.fnameescape(prepends) + exec 'set rtp-='.fnameescape(appends) endf func! s:rtp_add_a() - call filter(reverse(copy(g:bundles)), 's:rtp_add(v:val.rtpath)') + let paths = map(copy(g:bundles), 'v:val.rtpath') + let prepends = join(paths, ',') + let appends = join(paths, '/after,').'/after' + exec 'set rtp^='.fnameescape(prepends) + exec 'set rtp+='.fnameescape(appends) endf func! s:rtp_rm(dir) abort From 24f1b018c68271931fe770472ce44da93a04e7c9 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 20 Feb 2012 13:33:49 -0600 Subject: [PATCH 16/50] LICENSE.txt - closes #141 --- LICENSE.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..003904d --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,7 @@ +Copyright (C) 2010 http://github.com/gmarik + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From a910b88797ffd140771e367b5ce4e4d31ec68b9e Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 20 Feb 2012 13:41:35 -0600 Subject: [PATCH 17/50] rename LICENSE.txt to LICENSE-MIT.txt --- LICENSE.txt => LICENSE-MIT.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.txt => LICENSE-MIT.txt (100%) diff --git a/LICENSE.txt b/LICENSE-MIT.txt similarity index 100% rename from LICENSE.txt rename to LICENSE-MIT.txt From 03ed2bd39e37c5ff035c05197af81558eb5d8a89 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 5 Mar 2012 13:11:21 -0600 Subject: [PATCH 18/50] get rid of unused testing code --- test/vimrc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/vimrc b/test/vimrc index bb1451d..c52a05b 100644 --- a/test/vimrc +++ b/test/vimrc @@ -69,13 +69,3 @@ set wildignore+=*/.git/* " set wildignore+=*/doc/* au VimEnter * BundleInstall - -func! s:assert_bundles() abort - for b in g:bundles - if (!isdirectory(b.path().'/.git/')) - throw b.name.' not installed' - endif - endfor -endf - -call s:assert_bundles() From 8ef528044843dbc2a92e5f888a83b3f4d9905b8c Mon Sep 17 00:00:00 2001 From: milant Date: Wed, 28 Mar 2012 05:02:30 -0700 Subject: [PATCH 19/50] Fixed typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d81e042..f080049 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Also [Vundle]: - manages runtime path of your installed scripts -- regenerates helptag atomatically +- regenerates helptag automatically ## Docs From d2f36550a9d74626fa517f7f60fad02f879752a8 Mon Sep 17 00:00:00 2001 From: zaiste Date: Sun, 1 Apr 2012 23:47:34 +0200 Subject: [PATCH 20/50] Link to vimified conf --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f080049..9b44641 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. * [gmarik's vimrc](https://github.com/gmarik/vimfiles/blob/1f4f26d42f54443f1158e0009746a56b9a28b053/vimrc#L136) * [mutewinter's Vim Config of Champions](https://github.com/mutewinter/dot_vim) + * [vimified - Ultimate, kick-ass VIM configuration on top of Vundle](https://github.com/zaiste/vimified) If you have an interesting example, feel free to send a pull request with link to your config. Thx! From 09560847cad32de2d0aeccb6e599d9bc1fa6e70e Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Wed, 4 Apr 2012 19:26:13 -0700 Subject: [PATCH 21/50] Create Changelog when performing BundleInstall! Keeps track of the current commit with a vundle_update tag before perfoming an update and adds all commits pulled in the update to a Changelog accessible via pressing 'u' after BundleInstall! completes. --- README.md | 12 ++++++------ autoload/vundle.vim | 2 ++ autoload/vundle/installer.vim | 15 +++++++++++++++ autoload/vundle/scripts.vim | 29 +++++++++++++++++++++++++++++ doc/vundle.txt | 3 ++- 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9b44641..9de30ce 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Bundle 'git://git.wincent.com/command-t.git' " ... - filetype plugin indent on " required! + filetype plugin indent on " required! " " Brief help " :BundleList - list configured bundles @@ -62,7 +62,7 @@ *Windows users* see [Vundle for Windows](https://github.com/gmarik/vundle/wiki/Vundle-for-Windows) Installing requires [Git] and triggers [Git clone](http://gitref.org/creating/#clone) for each configured repo to `~/.vim/bundle/`. - + 4. Consider [donating](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=T44EJZX8RBUWY) [*Thank you*](http://j.mp/rSbm01) for supporting this project! ) @@ -145,7 +145,7 @@ see [wiki](/gmarik/vundle/wiki) [all available vim scripts]:http://vim-scripts.org/vim/scripts.html [install]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L110-124 -[update]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L128-133 -[search]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L135-157 -[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L167-179 -[interactive mode]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L183-209 +[update]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L128-134 +[search]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L136-158 +[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L168-180 +[interactive mode]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L184-210 diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 096f7cc..b81650a 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -37,6 +37,8 @@ endif func! vundle#rc(...) abort let g:bundle_dir = len(a:000) > 0 ? expand(a:1, 1) : expand('$HOME/.vim/bundle', 1) + let g:updated_bundles = [] let g:vundle_log = [] + let g:vundle_changelog = ['Updated Bundles:'] call vundle#config#init() endf diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index e2a8291..f1e6dbf 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -204,6 +204,7 @@ func! s:sync(bang, bundle) abort let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives let cmd = '"'.cmd.'"' " enclose in quotes endif + call s:add_update_tag(a:bundle) else let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) endif @@ -222,6 +223,7 @@ func! s:sync(bang, bundle) abort return 'todate' end + call s:add_to_updated_bundle_list(a:bundle) return 'updated' endf @@ -229,6 +231,19 @@ func! s:system(cmd) abort return system(a:cmd) endf +func! s:add_update_tag(bundle) abort + call s:system('cd '.shellescape(a:bundle.path()). + \ ' && git tag -a vundle_update -m "Last Vundle Update" -f') +endfunc + +func! s:add_to_updated_bundle_list(bundle) abort + let current_commit = s:system('cd '.shellescape(a:bundle.path()).' && git rev-list HEAD') + let initial_commit = s:system('cd '.shellescape(a:bundle.path()).' && git rev-list vundle_update') + if (0 == v:shell_error) && (initial_commit != current_commit) + call add(g:updated_bundles, a:bundle) + endif +endfunc + func! s:log(str) abort let fmt = '%y%m%d %H:%M:%S' call add(g:vundle_log, '['.strftime(fmt).'] '.a:str) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 324c281..1d4b185 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -33,6 +33,33 @@ func! s:view_log() wincmd P | wincmd H endf +func! s:create_changelog() abort + for bundle in g:updated_bundles + let updates = system('cd '.shellescape(bundle.path()). + \ ' && git log --pretty=format:"%s %an, %ar" --graph'. + \ ' vundle_update..HEAD') + call add(g:vundle_changelog, '') + call add(g:vundle_changelog, 'Updated Bundle: '.bundle.name) + for update in split(updates, '\n') + let update = substitute(update, '\s\+$', '', '') + call add(g:vundle_changelog, ' '.update) + endfor + endfor +endf + +func! s:view_changelog() + call s:create_changelog() + + if !exists('g:vundle_changelog_file') + let g:vundle_changelog_file = tempname() + endif + + call writefile(g:vundle_changelog, g:vundle_changelog_file) + silent pedit `=g:vundle_changelog_file` + + wincmd P | wincmd H +endf + func! vundle#scripts#bundle_names(names) return map(copy(a:names), ' printf("Bundle ' ."'%s'".'", v:val) ') endf @@ -80,6 +107,7 @@ func! vundle#scripts#view(title, headers, results) com! -buffer -nargs=0 VundleLog call s:view_log() + com! -buffer -nargs=0 VundleChangelog call s:view_changelog() nnoremap q :silent bd! nnoremap D :exec 'Delete'.getline('.') @@ -91,6 +119,7 @@ func! vundle#scripts#view(title, headers, results) nnoremap I :exec 'InstallAndRequire'.substitute(getline('.'), '^Bundle ', 'Bundle! ', '') nnoremap l :VundleLog + nnoremap u :VundleChangelog nnoremap h :h vundle nnoremap ? :norm h diff --git a/doc/vundle.txt b/doc/vundle.txt index 3049fc9..57e7260 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -132,6 +132,7 @@ run > :BundleInstall! " NOTE: bang(!) installs or updates configured scripts. +press u after updates complete to see the changelog of all updated bundles. 4.4 SEARCHING ~ *vundle-scripts-search* *BundleSearch* @@ -175,7 +176,7 @@ confirms removal of unused script-dirs from `.vim/bundle/`. *BundleClean!* > - :BundleClean! + :BundleClean! removes unused dirs with no questions. From 769feb9fff1ef87c5607fd7a1c4c6b31d7960128 Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Tue, 17 Apr 2012 02:51:29 -0700 Subject: [PATCH 22/50] Add GitHub Compare link to Changelog. If the Bundle is hosted on GitHub include link to compare the commit range visually on GitHub. --- autoload/vundle/scripts.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 1d4b185..642f21e 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -35,11 +35,15 @@ endf func! s:create_changelog() abort for bundle in g:updated_bundles + let update_sha = system('cd '.shellescape(bundle.path()).' && git rev-list -1 vundle_update')[0:9] let updates = system('cd '.shellescape(bundle.path()). \ ' && git log --pretty=format:"%s %an, %ar" --graph'. \ ' vundle_update..HEAD') call add(g:vundle_changelog, '') call add(g:vundle_changelog, 'Updated Bundle: '.bundle.name) + if bundle.uri =~ "https://github.com" + call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.update_sha.'...HEAD') + endif for update in split(updates, '\n') let update = substitute(update, '\s\+$', '', '') call add(g:vundle_changelog, ' '.update) From c6f7607e850eff6f8699b0114167da952077da6c Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 17 Apr 2012 20:12:11 -0500 Subject: [PATCH 23/50] add `new` status --- autoload/vundle.vim | 3 ++- autoload/vundle/installer.vim | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 096f7cc..25ce735 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -30,7 +30,8 @@ if (has('signs')) sign define Vu_error text=! texthl=Error sign define Vu_active text=> texthl=Comment sign define Vu_todate text=. texthl=Comment -sign define Vu_updated text=+ texthl=Comment +sign define Vu_new text=+ texthl=Comment +sign define Vu_updated text=* texthl=Comment sign define Vu_deleted text=- texthl=Comment endif diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index e2a8291..bd018c4 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -53,8 +53,10 @@ func! vundle#installer#run(func_name, name, ...) abort redraw - if 'updated' == status + if 'new' == status echo n.' installed' + elseif 'updated' == status + echo n.' updated' elseif 'todate' == status echo n.' already installed' elseif 'deleted' == status @@ -218,9 +220,11 @@ func! s:sync(bang, bundle) abort return 'error' end - if out =~# 'up-to-date' + if out =~# 'Cloning into ' + return 'new' + elseif out =~# 'up-to-date' return 'todate' - end + endif return 'updated' endf From 8c4e0a4a318859c7214b7b3c19568ff6bd891c22 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 17 Apr 2012 20:12:11 -0500 Subject: [PATCH 24/50] add `new` status --- autoload/vundle.vim | 3 ++- autoload/vundle/installer.vim | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index b81650a..3bd67c5 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -30,7 +30,8 @@ if (has('signs')) sign define Vu_error text=! texthl=Error sign define Vu_active text=> texthl=Comment sign define Vu_todate text=. texthl=Comment -sign define Vu_updated text=+ texthl=Comment +sign define Vu_new text=+ texthl=Comment +sign define Vu_updated text=* texthl=Comment sign define Vu_deleted text=- texthl=Comment endif diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index f1e6dbf..5b36f5e 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -53,8 +53,10 @@ func! vundle#installer#run(func_name, name, ...) abort redraw - if 'updated' == status + if 'new' == status echo n.' installed' + elseif 'updated' == status + echo n.' updated' elseif 'todate' == status echo n.' already installed' elseif 'deleted' == status @@ -219,9 +221,11 @@ func! s:sync(bang, bundle) abort return 'error' end - if out =~# 'up-to-date' + if out =~# 'Cloning into ' + return 'new' + elseif out =~# 'up-to-date' return 'todate' - end + endif call s:add_to_updated_bundle_list(a:bundle) return 'updated' From e999886db5cf69cdbbdf58b847c2fc93193e1213 Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Wed, 18 Apr 2012 01:19:25 -0700 Subject: [PATCH 25/50] Use 'new' & 'updated' to build updated_bundle list Distinction between `new` and `updated` simplifies the process of adding a bundle to the updated_bundle list. --- autoload/vundle/installer.vim | 10 +--------- autoload/vundle/scripts.vim | 4 +++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 5b36f5e..f3da3f0 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -227,7 +227,7 @@ func! s:sync(bang, bundle) abort return 'todate' endif - call s:add_to_updated_bundle_list(a:bundle) + call add(g:updated_bundles, a:bundle) return 'updated' endf @@ -240,14 +240,6 @@ func! s:add_update_tag(bundle) abort \ ' && git tag -a vundle_update -m "Last Vundle Update" -f') endfunc -func! s:add_to_updated_bundle_list(bundle) abort - let current_commit = s:system('cd '.shellescape(a:bundle.path()).' && git rev-list HEAD') - let initial_commit = s:system('cd '.shellescape(a:bundle.path()).' && git rev-list vundle_update') - if (0 == v:shell_error) && (initial_commit != current_commit) - call add(g:updated_bundles, a:bundle) - endif -endfunc - func! s:log(str) abort let fmt = '%y%m%d %H:%M:%S' call add(g:vundle_log, '['.strftime(fmt).'] '.a:str) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 642f21e..0139e06 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -35,15 +35,17 @@ endf func! s:create_changelog() abort for bundle in g:updated_bundles - let update_sha = system('cd '.shellescape(bundle.path()).' && git rev-list -1 vundle_update')[0:9] let updates = system('cd '.shellescape(bundle.path()). \ ' && git log --pretty=format:"%s %an, %ar" --graph'. \ ' vundle_update..HEAD') call add(g:vundle_changelog, '') call add(g:vundle_changelog, 'Updated Bundle: '.bundle.name) + if bundle.uri =~ "https://github.com" + let update_sha = system('cd '.shellescape(bundle.path()).' && git rev-list -1 vundle_update')[0:9] call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.update_sha.'...HEAD') endif + for update in split(updates, '\n') let update = substitute(update, '\s\+$', '', '') call add(g:vundle_changelog, ' '.update) From a52d4b91f40023f14dfe47254d697c0edb9fa9f1 Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Wed, 18 Apr 2012 22:28:05 -0700 Subject: [PATCH 26/50] Get initial/updated shas from `git pull` output. Instead of creating a vundle_update tag to compare changes between update and HEAD we now use the output from `git pull` to get initial/updated shas. --- autoload/vundle/installer.vim | 12 +++++++----- autoload/vundle/scripts.vim | 13 ++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index f3da3f0..b7ed7c2 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -206,7 +206,6 @@ func! s:sync(bang, bundle) abort let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives let cmd = '"'.cmd.'"' " enclose in quotes endif - call s:add_update_tag(a:bundle) else let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) endif @@ -227,7 +226,7 @@ func! s:sync(bang, bundle) abort return 'todate' endif - call add(g:updated_bundles, a:bundle) + call s:add_to_updated_bundles(out, a:bundle) return 'updated' endf @@ -235,9 +234,12 @@ func! s:system(cmd) abort return system(a:cmd) endf -func! s:add_update_tag(bundle) abort - call s:system('cd '.shellescape(a:bundle.path()). - \ ' && git tag -a vundle_update -m "Last Vundle Update" -f') +func! s:add_to_updated_bundles(out, bundle) abort + let git_pull_shas = matchlist(a:out, 'Updating \(\w\+\)..\(\w\+\)') + let initial_sha = git_pull_shas[1] + let updated_sha = git_pull_shas[2] + + call add(g:updated_bundles, [initial_sha, updated_sha, a:bundle]) endfunc func! s:log(str) abort diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 0139e06..0766033 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -34,16 +34,19 @@ func! s:view_log() endf func! s:create_changelog() abort - for bundle in g:updated_bundles + for bundle_data in g:updated_bundles + let initial_sha = bundle_data[0] + let updated_sha = bundle_data[1] + let bundle = bundle_data[2] + let updates = system('cd '.shellescape(bundle.path()). - \ ' && git log --pretty=format:"%s %an, %ar" --graph'. - \ ' vundle_update..HEAD') + \ ' && git log --pretty=format:"%s %an, %ar" --graph '. + \ initial_sha.'..'.updated_sha) call add(g:vundle_changelog, '') call add(g:vundle_changelog, 'Updated Bundle: '.bundle.name) if bundle.uri =~ "https://github.com" - let update_sha = system('cd '.shellescape(bundle.path()).' && git rev-list -1 vundle_update')[0:9] - call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.update_sha.'...HEAD') + call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha) endif for update in split(updates, '\n') From f84fee88394131b5eed3dc7f00cf06545505e63e Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Thu, 19 Apr 2012 13:59:45 -0700 Subject: [PATCH 27/50] Add message on how to view changelog after Update. If no errors exist, the status-line will inform users how to view the Changelog after BundleUpdate! is completed. --- autoload/vundle/installer.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index b7ed7c2..054f5a2 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -29,6 +29,10 @@ func! s:process(bang, cmd) let msg = 'With errors; press l to view log' endif + if 'updated' == g:vundle_last_status && empty(msg) + let msg = 'Bundles updated; press u to view changelog' + endif + " goto next one exec ':+1' From faf8dd38b6960715b60536822d79ab41bacd8eff Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 20 Apr 2012 09:55:40 -0500 Subject: [PATCH 28/50] Safeguard when no matches - addresses #162 issues --- autoload/vundle/installer.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 054f5a2..730db3a 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -240,6 +240,9 @@ endf func! s:add_to_updated_bundles(out, bundle) abort let git_pull_shas = matchlist(a:out, 'Updating \(\w\+\)..\(\w\+\)') + + if (empty(git_pull_shas)) | return | endif + let initial_sha = git_pull_shas[1] let updated_sha = git_pull_shas[2] From d62b51a8fea39fb5345123b7590c80ba6c8e102d Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 20 Apr 2012 10:06:18 -0500 Subject: [PATCH 29/50] helptags status - as before Helptags returned 'updated' --- autoload/vundle.vim | 1 + autoload/vundle/installer.vim | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 3bd67c5..1ac74e1 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -33,6 +33,7 @@ sign define Vu_todate text=. texthl=Comment sign define Vu_new text=+ texthl=Comment sign define Vu_updated text=* texthl=Comment sign define Vu_deleted text=- texthl=Comment +sign define Vu_helptags text=* texthl=Comment endif diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 730db3a..5a1a5ee 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -65,6 +65,8 @@ func! vundle#installer#run(func_name, name, ...) abort echo n.' already installed' elseif 'deleted' == status echo n.' deleted' + elseif 'helptags' == status + echo n.' regenerated' elseif 'error' == status echohl Error echo 'Error processing '.n @@ -105,7 +107,7 @@ endf func! vundle#installer#docs() abort call vundle#installer#helptags(g:bundles) - return 'updated' + return 'helptags' endf func! vundle#installer#helptags(bundles) abort From e56d772ecf6ed75480a50b39332f720fe9af86b0 Mon Sep 17 00:00:00 2001 From: Matt Furden Date: Fri, 20 Apr 2012 12:40:16 -0700 Subject: [PATCH 30/50] Return bundle status without using git output text Instead checking for specific text in the output of the git commands, determine the status of the bundle by comparing the sha of HEAD before and after the git pull command. --- autoload/vundle/installer.vim | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 5a1a5ee..38a2436 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -212,8 +212,12 @@ func! s:sync(bang, bundle) abort let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives let cmd = '"'.cmd.'"' " enclose in quotes endif + + let get_current_sha = 'cd '.shellescape(a:bundle.path()).' && git rev-parse HEAD' + let initial_sha = s:system(get_current_sha)[0:15] else let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) + let initial_sha = '' endif let out = s:system(cmd) @@ -226,13 +230,17 @@ func! s:sync(bang, bundle) abort return 'error' end - if out =~# 'Cloning into ' + if empty(initial_sha) return 'new' - elseif out =~# 'up-to-date' + endif + + let updated_sha = s:system(get_current_sha)[0:15] + + if initial_sha == updated_sha return 'todate' endif - call s:add_to_updated_bundles(out, a:bundle) + call add(g:updated_bundles, [initial_sha, updated_sha, a:bundle]) return 'updated' endf @@ -240,17 +248,6 @@ func! s:system(cmd) abort return system(a:cmd) endf -func! s:add_to_updated_bundles(out, bundle) abort - let git_pull_shas = matchlist(a:out, 'Updating \(\w\+\)..\(\w\+\)') - - if (empty(git_pull_shas)) | return | endif - - let initial_sha = git_pull_shas[1] - let updated_sha = git_pull_shas[2] - - call add(g:updated_bundles, [initial_sha, updated_sha, a:bundle]) -endfunc - func! s:log(str) abort let fmt = '%y%m%d %H:%M:%S' call add(g:vundle_log, '['.strftime(fmt).'] '.a:str) From c678b861dc3907432a2f79ce3acf778940f7006b Mon Sep 17 00:00:00 2001 From: robi-wan Date: Sun, 29 Apr 2012 23:59:55 +0300 Subject: [PATCH 31/50] fix Changelog after BundleInstall! on windows - add /d switch to cd command to perform drive change - enclose joined commands with quotes --- autoload/vundle/scripts.vim | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 0766033..a7ef724 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -39,9 +39,17 @@ func! s:create_changelog() abort let updated_sha = bundle_data[1] let bundle = bundle_data[2] - let updates = system('cd '.shellescape(bundle.path()). + let cmd = 'cd '.shellescape(bundle.path()). \ ' && git log --pretty=format:"%s %an, %ar" --graph '. - \ initial_sha.'..'.updated_sha) + \ initial_sha.'..'.updated_sha + + if (has('win32') || has('win64')) + let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives + let cmd = '"'.cmd.'"' " enclose in quotes + endif + + let updates = system(cmd) + call add(g:vundle_changelog, '') call add(g:vundle_changelog, 'Updated Bundle: '.bundle.name) From f928ba0491396cf7a8242b7db9287610e17154e3 Mon Sep 17 00:00:00 2001 From: mduan Date: Wed, 6 Jun 2012 20:11:06 -0700 Subject: [PATCH 32/50] Make git clone also grab submodules With just `git clone`, submodules are not grabbed. This is an issue for certain plugins, such as 'kevinw/pyflakes-vim' that requires a pyflakes submodule --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 38a2436..6814f94 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -216,7 +216,7 @@ func! s:sync(bang, bundle) abort let get_current_sha = 'cd '.shellescape(a:bundle.path()).' && git rev-parse HEAD' let initial_sha = s:system(get_current_sha)[0:15] else - let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) + let cmd = 'git clone --recursive '.a:bundle.uri.' '.shellescape(a:bundle.path()) let initial_sha = '' endif From c4985923e2664b3095627730533c0ff83773a7dc Mon Sep 17 00:00:00 2001 From: mduan Date: Thu, 7 Jun 2012 13:32:42 -0700 Subject: [PATCH 33/50] Also update submodules during git pull --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 6814f94..b0c9526 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -206,7 +206,7 @@ func! s:sync(bang, bundle) abort let git_dir = expand(a:bundle.path().'/.git/', 1) if isdirectory(git_dir) if !(a:bang) | return 'todate' | endif - let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull' + let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull && git submodule update --init --recursive' if (has('win32') || has('win64')) let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives From 5e9cbda7beaa185751ffa99562653578db58fe51 Mon Sep 17 00:00:00 2001 From: Yury Khalyavin Date: Wed, 20 Jun 2012 10:54:36 +0400 Subject: [PATCH 34/50] Vundle can manage Vundle, when it cloned as git submodule When vundle installed as git submodule, git create file '.git' instead of directory '.git'. And vundle cannot update by self :( --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 38a2436..036a756 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -204,7 +204,7 @@ endf func! s:sync(bang, bundle) abort let git_dir = expand(a:bundle.path().'/.git/', 1) - if isdirectory(git_dir) + if isdirectory(git_dir) || filereadable(expand(a:bundle.path().'/.git', 1)) if !(a:bang) | return 'todate' | endif let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull' From 1a935a259b95317e4d7c3a3450351504635b4aa8 Mon Sep 17 00:00:00 2001 From: Zeux Date: Fri, 6 Jul 2012 13:48:52 +0400 Subject: [PATCH 35/50] Fix wget/win32 codepath for script searching. The codepath does not appear to have been tested; mv on Win32 is move, and substitute has 4 arguments instead of 3. --- autoload/vundle/scripts.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index a7ef724..53a77e1 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -163,7 +163,7 @@ func! s:fetch_scripts(to) let temp = shellescape(tempname()) let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.shellescape(a:to) if (has('win32') || has('win64')) - let cmd = substitute(cmd, 'mv -f ', 'mv /Y ') " change force flag + let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag let cmd = '"'.cmd.'"' " enclose in quotes so && joined cmds work end else From 1e140c9f6b5c1c2b9c3a6c01723b3d627b56fb31 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 29 Apr 2012 00:24:01 -0500 Subject: [PATCH 36/50] change &rtp manipulation - make it append only (instead both append + prepend) - which draws *_rm_a and *_add_a useless as &rtp order gets preserved - benefits: simpler, faster, less code --- autoload/vundle/config.vim | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 55c7d7d..3ed0cf8 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -1,14 +1,13 @@ func! vundle#config#bundle(arg, ...) let bundle = vundle#config#init_bundle(a:arg, a:000) - call s:rtp_rm_a() + call s:rtp_rm(bundle.rtpath) call add(g:bundles, bundle) - call s:rtp_add_a() + call s:rtp_add(bundle.rtpath) return bundle endf func! vundle#config#init() if !exists('g:bundles') | let g:bundles = [] | endif - call s:rtp_rm_a() let g:bundles = [] endf @@ -64,30 +63,17 @@ func! s:parse_name(arg) return {'name': name, 'uri': uri, 'name_spec': arg } endf -func! s:rtp_rm_a() - let paths = map(copy(g:bundles), 'v:val.rtpath') - let prepends = join(paths, ',') - let appends = join(paths, '/after,').'/after' - exec 'set rtp-='.fnameescape(prepends) - exec 'set rtp-='.fnameescape(appends) -endf - -func! s:rtp_add_a() - let paths = map(copy(g:bundles), 'v:val.rtpath') - let prepends = join(paths, ',') - let appends = join(paths, '/after,').'/after' - exec 'set rtp^='.fnameescape(prepends) - exec 'set rtp+='.fnameescape(appends) -endf - func! s:rtp_rm(dir) abort exec 'set rtp-='.fnameescape(expand(a:dir, 1)) exec 'set rtp-='.fnameescape(expand(a:dir.'/after', 1)) endf func! s:rtp_add(dir) abort - exec 'set rtp^='.fnameescape(expand(a:dir, 1)) - exec 'set rtp+='.fnameescape(expand(a:dir.'/after', 1)) + exec 'set rtp+='.fnameescape(expand(a:dir, 1)) + let after_dir = expand(a:dir.'/after', 1) + if isdirectory(after_dir) + exec 'set rtp+='.fnameescape(after_dir) + end endf func! s:expand_path(path) abort From 56ee523240dc192808a83fef3a3bc0d6a9adcd23 Mon Sep 17 00:00:00 2001 From: Sam Lidder Date: Fri, 3 Aug 2012 00:23:15 -0400 Subject: [PATCH 37/50] fix test for glob* function compatibility - not all versions of vim 7.2 support the extra argument for glob*(), only those compiled with patch 51 --- autoload/vundle/installer.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 036a756..b610f0d 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -134,7 +134,9 @@ endf func! vundle#installer#clean(bang) abort let bundle_dirs = map(copy(g:bundles), 'v:val.path()') - let all_dirs = v:version >= 702 ? split(globpath(g:bundle_dir, '*', 1), "\n") : split(globpath(g:bundle_dir, '*'), "\n") + let all_dirs = (v:version > 702 || (v:version == 702 && has("patch51"))) + \ ? split(globpath(g:bundle_dir, '*', 1), "\n") + \ : split(globpath(g:bundle_dir, '*'), "\n") let x_dirs = filter(all_dirs, '0 > index(bundle_dirs, v:val)') if empty(x_dirs) @@ -187,7 +189,7 @@ endf func! s:has_doc(rtp) abort return isdirectory(a:rtp.'/doc') \ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags')) - \ && v:version >= 702 + \ && (v:version > 702 || (v:version == 702 && has("patch51"))) \ ? !(empty(glob(a:rtp.'/doc/*.txt', 1)) && empty(glob(a:rtp.'/doc/*.??x', 1))) \ : !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x'))) endf From 93db227e2ca8ad9de6664713b41af60987110c73 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 11 Aug 2012 16:16:58 -0500 Subject: [PATCH 38/50] README update - link to contributors --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 9de30ce..3f0ac6e 100644 --- a/README.md +++ b/README.md @@ -102,12 +102,7 @@ see [wiki](/gmarik/vundle/wiki) ## Contributors -* [redlinesoftware](http://redlinesoftware.com) - for lending me 24" monitor! -* [Marc Jeanson](https://github.com/marcjeanson) - vim dude I always bug for help...;) -* [Brad Anderson](http://github.com/eco) (windows support) -* [Ryan W](http://github.com/rygwdn) -* [termac](http://github.com/termac) -* and others + see [vundle contributors](https://github.com/gmarik/vundle/graphs/contributors) *Thank you!* From fefb3df7cb250cb71f2caafabc6ca705401b01cb Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 11 Aug 2012 16:20:49 -0500 Subject: [PATCH 39/50] README examples moved to Wiki --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 3f0ac6e..3b55afa 100644 --- a/README.md +++ b/README.md @@ -90,11 +90,7 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. ## People Using Vundle - * [gmarik's vimrc](https://github.com/gmarik/vimfiles/blob/1f4f26d42f54443f1158e0009746a56b9a28b053/vimrc#L136) - * [mutewinter's Vim Config of Champions](https://github.com/mutewinter/dot_vim) - * [vimified - Ultimate, kick-ass VIM configuration on top of Vundle](https://github.com/zaiste/vimified) - - If you have an interesting example, feel free to send a pull request with link to your config. Thx! +see [Examples](/gmarik/vundle/wiki/Examples) ## FAQ From e6b7cea59f0355d41d33efa4fdb7a666bf47698e Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 11 Aug 2012 19:31:38 -0500 Subject: [PATCH 40/50] Larger screenshot --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b55afa..a25c77c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [Vundle] is short for **V**imb**undle** and is a [Vim] plugin manager. -![Vundle-installer](https://lh3.googleusercontent.com/-4EnLqLpEZlk/TlqXWpgWxOI/AAAAAAAAHRw/oBAl6s1hj7U/vundle-install2.png) +![Vundle-installer](http://25.media.tumblr.com/tumblr_m8m96w06G81r39828o1_1280.png) ## Quick start From 3ad4b0334c526c9580ee783c75803f10d43c2a82 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 15 Aug 2012 02:04:55 -0500 Subject: [PATCH 41/50] Revert "change &rtp manipulation" - causes #203 This reverts commit 1e140c9f6b5c1c2b9c3a6c01723b3d627b56fb31. --- autoload/vundle/config.vim | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 3ed0cf8..55c7d7d 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -1,13 +1,14 @@ func! vundle#config#bundle(arg, ...) let bundle = vundle#config#init_bundle(a:arg, a:000) - call s:rtp_rm(bundle.rtpath) + call s:rtp_rm_a() call add(g:bundles, bundle) - call s:rtp_add(bundle.rtpath) + call s:rtp_add_a() return bundle endf func! vundle#config#init() if !exists('g:bundles') | let g:bundles = [] | endif + call s:rtp_rm_a() let g:bundles = [] endf @@ -63,17 +64,30 @@ func! s:parse_name(arg) return {'name': name, 'uri': uri, 'name_spec': arg } endf +func! s:rtp_rm_a() + let paths = map(copy(g:bundles), 'v:val.rtpath') + let prepends = join(paths, ',') + let appends = join(paths, '/after,').'/after' + exec 'set rtp-='.fnameescape(prepends) + exec 'set rtp-='.fnameescape(appends) +endf + +func! s:rtp_add_a() + let paths = map(copy(g:bundles), 'v:val.rtpath') + let prepends = join(paths, ',') + let appends = join(paths, '/after,').'/after' + exec 'set rtp^='.fnameescape(prepends) + exec 'set rtp+='.fnameescape(appends) +endf + func! s:rtp_rm(dir) abort exec 'set rtp-='.fnameescape(expand(a:dir, 1)) exec 'set rtp-='.fnameescape(expand(a:dir.'/after', 1)) endf func! s:rtp_add(dir) abort - exec 'set rtp+='.fnameescape(expand(a:dir, 1)) - let after_dir = expand(a:dir.'/after', 1) - if isdirectory(after_dir) - exec 'set rtp+='.fnameescape(after_dir) - end + exec 'set rtp^='.fnameescape(expand(a:dir, 1)) + exec 'set rtp+='.fnameescape(expand(a:dir.'/after', 1)) endf func! s:expand_path(path) abort From 3bf598d169993d703c21115876c36e460a51b100 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 15 Aug 2012 02:48:41 -0500 Subject: [PATCH 42/50] add syntax test cases --- test/files/test.erl | 20 ++++++++++++++++++++ test/vimrc | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 test/files/test.erl diff --git a/test/files/test.erl b/test/files/test.erl new file mode 100644 index 0000000..1672953 --- /dev/null +++ b/test/files/test.erl @@ -0,0 +1,20 @@ +-module(mmc_logmon_sup). +-behaviour(supervisor). +-export([init/1]). + +init(_) -> + {ok, { + {one_for_one, 5, 1}, + [ + {listener, + {aaa, start_link, []}, + permanent, 100, worker, + [aaa] + }, + {server, + {bbb, start_link, []}, + permanent, 100, worker, + [bbb] + } + ] + }}. diff --git a/test/vimrc b/test/vimrc index c52a05b..662709f 100644 --- a/test/vimrc +++ b/test/vimrc @@ -58,6 +58,9 @@ Bundle 'rstacruz/sparkup.git', {'rtp': 'vim/'} " Camel case Bundle 'vim-scripts/RubySinatra' +" syntax issue #203 +Bundle 'jimenezrick/vimerl' + filetype plugin indent on " Automatically detect file types. set wildignore+=doc " should not break helptags @@ -69,3 +72,5 @@ set wildignore+=*/.git/* " set wildignore+=*/doc/* au VimEnter * BundleInstall + +" e test/files/erlang.erl From a6066d641bc24428c1775409ab7fd1529a3199d1 Mon Sep 17 00:00:00 2001 From: mt3 Date: Wed, 12 Sep 2012 18:07:38 -0700 Subject: [PATCH 43/50] Added alias 'BundleUpdate' for 'BundleInstall!'. 'BundleUpdate' is a more intuitive and explicit command, whereas 'BundleInstall!' isn't. --- autoload/vundle.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 1ac74e1..0bc7bf5 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -25,6 +25,8 @@ com! -nargs=? -bang BundleClean com! -nargs=0 BundleDocs \ call vundle#installer#helptags(g:bundles) +" Aliases +com! BundleUpdate BundleInstall! if (has('signs')) sign define Vu_error text=! texthl=Error From b5bef26e2c8492412aa96484cb7d73dc6195cb53 Mon Sep 17 00:00:00 2001 From: robi-wan Date: Wed, 28 Nov 2012 19:47:20 +0100 Subject: [PATCH 44/50] escape shell commands for windows inspired by https://github.com/gmarik/vundle/pull/228 and https://github.com/gmarik/vundle/pull/172 Vim patch #445 changed shell escaping and introduced incompatabilities for vundle. Now vundle only escapes joined commands with double quotes on windows when shellxquote is not set to '('. This workaround closes https://github.com/gmarik/vundle/issues/146 - the mentioned workaround is no longer needed, but it does not break a vim configurations which contains "set shellxquote=". DRY shell escaping and modified (hopefully) all relevant places. --- autoload/vundle/installer.vim | 25 +++++++++++++++++++++---- autoload/vundle/scripts.vim | 7 ++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index f7e4375..723406a 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -210,12 +210,10 @@ func! s:sync(bang, bundle) abort if !(a:bang) | return 'todate' | endif let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull && git submodule update --init --recursive' - if (has('win32') || has('win64')) - let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives - let cmd = '"'.cmd.'"' " enclose in quotes - endif + let cmd = g:shellesc_cd(cmd) let get_current_sha = 'cd '.shellescape(a:bundle.path()).' && git rev-parse HEAD' + let get_current_sha = g:shellesc_cd(get_current_sha) let initial_sha = s:system(get_current_sha)[0:15] else let cmd = 'git clone --recursive '.a:bundle.uri.' '.shellescape(a:bundle.path()) @@ -246,6 +244,25 @@ func! s:sync(bang, bundle) abort return 'updated' endf +func! g:shellesc(cmd) abort + if (has('win32') || has('win64')) + if &shellxquote != '(' " workaround for patch #445 + return '"'.a:cmd.'"' " enclose in quotes so && joined cmds work + endif + endif + return a:cmd +endf + +func! g:shellesc_cd(cmd) abort + if (has('win32') || has('win64')) + let cmd = substitute(a:cmd, '^cd ','cd /d ','') " add /d switch to change drives + let cmd = g:shellesc(cmd) + return cmd + else + return a:cmd + endif +endf + func! s:system(cmd) abort return system(a:cmd) endf diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 53a77e1..64a3301 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -43,10 +43,7 @@ func! s:create_changelog() abort \ ' && git log --pretty=format:"%s %an, %ar" --graph '. \ initial_sha.'..'.updated_sha - if (has('win32') || has('win64')) - let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives - let cmd = '"'.cmd.'"' " enclose in quotes - endif + let cmd = g:shellesc_cd(cmd) let updates = system(cmd) @@ -164,7 +161,7 @@ func! s:fetch_scripts(to) let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.shellescape(a:to) if (has('win32') || has('win64')) let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag - let cmd = '"'.cmd.'"' " enclose in quotes so && joined cmds work + let cmd = g:shellesc(cmd) end else echoerr 'Error curl or wget is not available!' From 84c9a542541d4504deb8eed38f15fe5a2497b6cc Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Sun, 11 Nov 2012 10:54:57 -0500 Subject: [PATCH 45/50] Escape the repo URI when cloning --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 723406a..d78a999 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -216,7 +216,7 @@ func! s:sync(bang, bundle) abort let get_current_sha = g:shellesc_cd(get_current_sha) let initial_sha = s:system(get_current_sha)[0:15] else - let cmd = 'git clone --recursive '.a:bundle.uri.' '.shellescape(a:bundle.path()) + let cmd = 'git clone --recursive '.shellescape(a:bundle.uri).' '.shellescape(a:bundle.path()) let initial_sha = '' endif From 418187a48784f2ed08866204985102e5b294fb54 Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Sun, 2 Dec 2012 07:47:10 +0000 Subject: [PATCH 46/50] Fix link to vim.org in README Fixes #217 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a25c77c..1386a5a 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ see [wiki](/gmarik/vundle/wiki) [Vundle]:http://github.com/gmarik/vundle [Pathogen]:http://github.com/tpope/vim-pathogen/ [Bundler]:http://github.com/wycats/bundler/ -[Vim]:http://vim.org +[Vim]:http://www.vim.org [Git]:http://git-scm.com [all available vim scripts]:http://vim-scripts.org/vim/scripts.html From 2a494ff00fc10ed5725fbb99ec267ec2c9917817 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 2 Dec 2012 12:41:22 -0600 Subject: [PATCH 47/50] fix Readme formatting **V**imb**undle** no longer rendering properly... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1386a5a..32ddb14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## About -[Vundle] is short for **V**imb**undle** and is a [Vim] plugin manager. +[Vundle] is short for _Vim bundle_ and is a [Vim] plugin manager. ![Vundle-installer](http://25.media.tumblr.com/tumblr_m8m96w06G81r39828o1_1280.png) From bb8a66d54425df231b8fd4480c11142289960c43 Mon Sep 17 00:00:00 2001 From: Ben Oakes Date: Mon, 4 Feb 2013 11:57:46 -0600 Subject: [PATCH 48/50] Fix wiki links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems to have broken with GitHub's relative link change https://github.com/blog/1395-relative-links-in-markup-files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32ddb14..02bba7f 100644 --- a/README.md +++ b/README.md @@ -90,11 +90,11 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. ## People Using Vundle -see [Examples](/gmarik/vundle/wiki/Examples) +see [Examples](https://github.com/gmarik/vundle/wiki/Examples) ## FAQ -see [wiki](/gmarik/vundle/wiki) +see [wiki](https://github.com/gmarik/vundle/wiki) ## Contributors From 8e8cfda2d27f832041c3d75b661cfee1a7586645 Mon Sep 17 00:00:00 2001 From: Matthew Schulkind Date: Wed, 6 Feb 2013 13:57:15 -0500 Subject: [PATCH 49/50] Prevent side effect of wildignore Certain wildignore values prevented the various logs from being viewable. Fixes #249 --- autoload/vundle/scripts.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 64a3301..ded6a46 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -28,7 +28,7 @@ func! s:view_log() endif call writefile(g:vundle_log, g:vundle_log_file) - silent pedit `=g:vundle_log_file` + execute 'silent pedit ' . g:vundle_log_file wincmd P | wincmd H endf @@ -69,7 +69,7 @@ func! s:view_changelog() endif call writefile(g:vundle_changelog, g:vundle_changelog_file) - silent pedit `=g:vundle_changelog_file` + execute 'silent pedit ' . g:vundle_changelog_file wincmd P | wincmd H endf From 5dd478e18e2a613466776c94f16dd5c329123cae Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Fri, 8 Feb 2013 02:42:12 +0000 Subject: [PATCH 50/50] Generate helptags independently from user settings The wildignore setting affects the behaviour of the `= shorthand, so this changeset replaces the last remaining use of such construct with a call to exec. --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index d78a999..c4d0580 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -198,7 +198,7 @@ func! s:helptags(rtp) abort let doc_path = a:rtp.'/doc/' call s:log(':helptags '.doc_path) try - helptags `=doc_path` + execute 'helptags ' . doc_path catch call s:log("> Error running :helptags ".doc_path) endtry