From 593b08b63de13fddc8f95d3ea2fc197040fe6846 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 9 May 2011 22:49:53 -0500 Subject: [PATCH 01/37] Vundle is a bundle too! Conflicts: test/vimrc --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bacbc79..ca8d24f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 1. Setup [Vundle]: - git clone http://github.com/gmarik/vundle.git ~/.vim/vundle.git + git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle 2. Configure bundles: @@ -15,9 +15,10 @@ set nocompatible " be iMproved filetype off " required! - set rtp+=~/.vim/vundle.git/ + set rtp+=~/.vim/bundle/vundle/ call vundle#rc() + " My Bundles here: " " original repos on github @@ -31,6 +32,8 @@ " non github repos Bundle 'git://git.wincent.com/command-t.git' " ... + " let Vundle manage Vundle + Bundle 'gmarik/vundle' filetype plugin indent on " required! @@ -108,10 +111,9 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. * √ activate newly added bundles on .vimrc reload or after :BundleInstall * √ use preview window for search results * √ vim documentation -* tests +* √ put vundle to bundles/ too(will fix vundle help) +* √ tests * improve error handling -* put vundle to bundles/ too(will fix vundle help) -* `:VundleUpdate` - self.update * handle dependencies * allow specify revision/version? * search by description aswell From 1cc7ab3dfd03d2ac5b617b553803c791b8ef8f14 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 9 May 2011 23:00:50 -0500 Subject: [PATCH 02/37] test/vimrc --- test/vimrc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/vimrc b/test/vimrc index 172679e..272c3a4 100644 --- a/test/vimrc +++ b/test/vimrc @@ -1,13 +1,19 @@ " vim -u test/vimrc set nocompatible +let root = '/tmp/vundle_bundles/' +if !isdirectory(expand(root).'/vundle') + exec '!git clone http://github.com/gmarik/vundle.git '.root.'/vundle' +endif + filetype off + runtime macros/matchit.vim -set rtp+=~/.vim/vundle.git/ -call vundle#rc('/tmp/vundle_bundles') +exec 'set rtp+='.root.'/vundle' + -silent BundleClean! +call vundle#rc(root) " vim-scripts name Bundle 'molokai' From e4ea64a992ca44691f11eb1338c3ca1074eb8ce0 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 18:14:32 -0500 Subject: [PATCH 03/37] Docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca8d24f..950ba85 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ set rtp+=~/.vim/bundle/vundle/ call vundle#rc() + " let Vundle manage Vundle + Bundle 'gmarik/vundle' " My Bundles here: " @@ -32,8 +34,6 @@ " non github repos Bundle 'git://git.wincent.com/command-t.git' " ... - " let Vundle manage Vundle - Bundle 'gmarik/vundle' filetype plugin indent on " required! From 88a1ec13ac13f71d533296b6b1849ad3c7f6bd4c Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 19:18:33 -0500 Subject: [PATCH 04/37] Add Bundle --- test/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/vimrc b/test/vimrc index 39350c5..065dc02 100644 --- a/test/vimrc +++ b/test/vimrc @@ -15,6 +15,8 @@ exec 'set rtp+='.root.'/vundle' call vundle#rc(root) +Bundle 'gmarik/vundle' + " vim-scripts name Bundle 'molokai' From 4ef824cf7542288236e939fd89b846561ddd2f19 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 19:18:52 -0500 Subject: [PATCH 05/37] fix dirname/ --- test/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/vimrc b/test/vimrc index 065dc02..de6fc82 100644 --- a/test/vimrc +++ b/test/vimrc @@ -53,7 +53,7 @@ BundleInstall func! s:assert_bundles() abort for b in g:bundles - if (!isdirectory(b.path().'/.git')) + if (!isdirectory(b.path().'/.git/')) throw b.name.' not installed' endif endfor From e73f5ffd049f784930456c312d427e4965ea2b27 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 18:52:54 -0500 Subject: [PATCH 06/37] fix indent --- doc/vundle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/vundle.txt b/doc/vundle.txt index e0925d4..6845d6c 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -7,7 +7,7 @@ CONTENTS ~ 1. About |vundle-about| 2. Why Vundle |vundle-why-vundle| 3. Quick start |vundle-quickstart| -4. Scripts |vundle-scripts| +4. Scripts |vundle-scripts| 4.1. Configure scripts |vundle-scripts-configure| 4.2. Installing scripts |vundle-scripts-install| 4.3. Updating scripts |vundle-scripts-update| From 6c2a34f33413bb026e6b31173ea0914f49a95de2 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 19:33:18 -0500 Subject: [PATCH 07/37] syntax on in text/vimrc --- test/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/vimrc b/test/vimrc index de6fc82..0b0f664 100644 --- a/test/vimrc +++ b/test/vimrc @@ -7,6 +7,7 @@ if !isdirectory(expand(root).'/vundle') endif filetype off +syntax on runtime macros/matchit.vim From 245338b23863baf6e9abb41a6855ec2db4046f74 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 16 May 2011 19:44:47 -0500 Subject: [PATCH 08/37] updated doc/vundle.txt --- doc/vundle.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/vundle.txt b/doc/vundle.txt index 6845d6c..c4cc22a 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -55,6 +55,9 @@ in order to install/search [all available vim scripts] set rtp+=~/.vim/vundle.git/ call vundle#rc() + " let Vundle manage Vundle + Bundle 'gmarik/vundle' + " My Bundles here: " " original repos on github From d5162b458b6df9a72117e358939e3522996d5755 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Tue, 17 May 2011 07:27:52 -0700 Subject: [PATCH 09/37] corrected path used for :helptags instructions to be inline with directory structure used in installation instructions. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 950ba85..95a6ec4 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Also [Vundle]: ## Docs -run [`:helptags ~/.vim/vundle.git/doc`](https://github.com/gmarik/vundle/issues/17) +run [`:helptags ~/.vim/bundle/vundle/doc`](https://github.com/gmarik/vundle/issues/17) see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. From 60fe2b40034ce9eb03f1a9ed5862243c0cd601ba Mon Sep 17 00:00:00 2001 From: Date: Tue, 17 May 2011 08:38:46 -0700 Subject: [PATCH 10/37] No need to generate helptags manually with `Bundle 'gmarik/vundle'` --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 95a6ec4..0fcefa3 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,6 @@ Also [Vundle]: ## Docs -run [`:helptags ~/.vim/bundle/vundle/doc`](https://github.com/gmarik/vundle/issues/17) - see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. ## Examples From a631bc351553aed143196f7cbd3931736b281823 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 18 May 2011 23:02:53 -0500 Subject: [PATCH 11/37] FAQ: Chicken or Egg dilemma --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 950ba85..8971d4c 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,11 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. Password: fatal: Authentication failed + +- **Q** My configuration is bundle dependant, so when I try to install plugins for the first time I get errors. How do I fix that? + + **A** [Fix your Chicken or Egg dilemma](http://gmarik.info/blog/2011/05/17/chicken-or-egg-dilemma) + ## Contributors * [redlinesoftware](http://redlinesoftware.com) - for lending me 24" monitor! From a2c5d5442df491f2800fe825111330c1fce75b68 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 14:30:50 -0500 Subject: [PATCH 12/37] Fix regex --- 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 2287140..96ff8bf 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -45,7 +45,7 @@ func! s:parse_name(arg) let uri = 'https://github.com/'.split(arg, ':')[-1] let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i') elseif arg =~? '^\s*\(git@\|git://\)\S\+' - \ || arg =~? '(file|https\?)://' + \ || arg =~? '\(file\|https\?\)://' \ || arg =~? '\.git\s*$' let uri = arg let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1] From 5bc033c06827ac60544681c617f3aeb985c11a05 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 14:50:20 -0500 Subject: [PATCH 13/37] test/vimrc --- test/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/vimrc b/test/vimrc index 0b0f664..a4f252e 100644 --- a/test/vimrc +++ b/test/vimrc @@ -29,6 +29,8 @@ Bundle 'altercation/vim-colors-solarized' " with extension Bundle 'nelstrom/vim-mac-classic-theme.git' +" full uri +Bundle 'https://github.com/vim-scripts/vim-game-of-life' " full uri Bundle 'git@github.com:gmarik/ingretu.git' " short uri From 0b6e05647bd1eff2db35bec21b23123e9fbc46ec Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 15:24:13 -0500 Subject: [PATCH 14/37] README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9cc098c..5d70f6b 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,8 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. See [gmarik's vimrc](https://github.com/gmarik/vimfiles/blob/1f4f26d42f54443f1158e0009746a56b9a28b053/vimrc#L136) for working example. + If you have an interesting example, feel free to send a pull request with link to your config. Thx! + ## FAQ - **Q** Why am I asked for username/pass? From cde56e37389b4bd9c5b1c3a3e4a0dbfd9cd191b5 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 23 May 2011 15:44:49 -0500 Subject: [PATCH 15/37] Mention that filetype indent need not be turned on --- README.md | 2 +- doc/vundle.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d70f6b..6c5300d 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Bundle 'git://git.wincent.com/command-t.git' " ... - filetype plugin indent on " required! + filetype plugin indent on " required! ("filetype plugin on" also works) 3. Install configured bundles: diff --git a/doc/vundle.txt b/doc/vundle.txt index c4cc22a..105d849 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -32,7 +32,7 @@ Vundle allows to: - clean up from unused scripts Also *Vundle* : - +< - manages runtime path of your installed scripts - regenerates helptags automatically @@ -74,6 +74,9 @@ in order to install/search [all available vim scripts] filetype plugin indent on " required! +< (You may also use "filetype plugin on" as the last line if you don't want + to use the indentation feature of the filetype system.) + 3) Install configured bundles: Launch `vim`, run > From a461b037aeca0f938ab405460762c47db1d90391 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 23 May 2011 15:46:27 -0500 Subject: [PATCH 16/37] Remove errant character (?) --- doc/vundle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/vundle.txt b/doc/vundle.txt index 105d849..95d177d 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -32,7 +32,7 @@ Vundle allows to: - clean up from unused scripts Also *Vundle* : -< + - manages runtime path of your installed scripts - regenerates helptags automatically From 04da8c0f59bc31dcb5ae19416dc3a2bfd3a46593 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 16:48:10 -0500 Subject: [PATCH 17/37] make documentation use ready just uncomment if you need it --- README.md | 4 +++- doc/vundle.txt | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6c5300d..999a0ca 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,9 @@ Bundle 'git://git.wincent.com/command-t.git' " ... - filetype plugin indent on " required! ("filetype plugin on" also works) + filetype plugin indent on " required! + " or + " filetype plugin on " to not use the indentation settings set by plugins 3. Install configured bundles: diff --git a/doc/vundle.txt b/doc/vundle.txt index 95d177d..1ef286a 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -73,9 +73,8 @@ in order to install/search [all available vim scripts] " ... filetype plugin indent on " required! - -< (You may also use "filetype plugin on" as the last line if you don't want - to use the indentation feature of the filetype system.) + " or + " filetype plugin on " to not use the indentation settings set by plugins 3) Install configured bundles: From faf85e299255691957d5b60e628b71c68ed9d2e4 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 16:54:49 -0500 Subject: [PATCH 18/37] README updated links --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 999a0ca..c3a3d88 100644 --- a/README.md +++ b/README.md @@ -135,8 +135,8 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. [Git]:http://git-scm.com [all available vim scripts]:http://vim-scripts.org/vim/scripts.html -[install]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L98-112 -[update]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L114-119 -[search]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L121-143 -[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L145-157 +[install]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L110-138 +[update]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L126-131 +[search]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L133-155 +[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L157-1169 [interactive mode]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L160-193 From e0279448016d30c5e9e70608aeb92fb078b68f2a Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 23 May 2011 16:59:01 -0500 Subject: [PATCH 19/37] fix links --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c3a3d88..b630b34 100644 --- a/README.md +++ b/README.md @@ -135,8 +135,8 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. [Git]:http://git-scm.com [all available vim scripts]:http://vim-scripts.org/vim/scripts.html -[install]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L110-138 +[install]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L110-124 [update]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L126-131 [search]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L133-155 -[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L157-1169 -[interactive mode]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L160-193 +[clean]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L157-169 +[interactive mode]:https://github.com/gmarik/vundle/blob/master/doc/vundle.txt#L172-205 From 9e4d3701cbc523d02a16f6e49d95ef35663831f0 Mon Sep 17 00:00:00 2001 From: Dag Odenhall Date: Wed, 25 May 2011 02:17:28 +0200 Subject: [PATCH 20/37] README: fix up some language --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b630b34..dd56593 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## About -[Vundle] is a short cut for **V**imb**undle** and is a [Vim] plugin manager. +[Vundle] is short for **V**imb**undle** and is a [Vim] plugin manager. ## Quick start @@ -77,7 +77,7 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. - **Q** Why am I asked for username/pass? - **A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexisting repo: + **A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexistent repo: git clone http://github.com/gmarik/non_existin_repo Cloning into non_existin_repo... @@ -123,8 +123,8 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. * improve error handling * handle dependencies * allow specify revision/version? -* search by description aswell -* show descrption in search results +* search by description as well +* show description in search results * instead sourcing .vimrc before installation come up with another solution * make it rock! From 72fc48e481410d727485b6df346fcc2f23b418d9 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 25 May 2011 21:37:16 -0500 Subject: [PATCH 21/37] Highlight code blocks Closes #43 --- README.md | 70 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index dd56593..f2709ab 100644 --- a/README.md +++ b/README.md @@ -6,38 +6,42 @@ 1. Setup [Vundle]: - git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + ```console + $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + ``` 2. Configure bundles: Sample `.vimrc`: - set nocompatible " be iMproved - filetype off " required! - - set rtp+=~/.vim/bundle/vundle/ - call vundle#rc() - - " let Vundle manage Vundle - Bundle 'gmarik/vundle' - - " My Bundles here: - " - " original repos on github - Bundle 'tpope/vim-fugitive' - Bundle 'lokaltog/vim-easymotion' - Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} - " vim-scripts repos - Bundle 'L9' - Bundle 'FuzzyFinder' - Bundle 'rails.vim' - " non github repos - Bundle 'git://git.wincent.com/command-t.git' - " ... - - filetype plugin indent on " required! - " or - " filetype plugin on " to not use the indentation settings set by plugins + ```vim + set nocompatible " be iMproved + filetype off " required! + + set rtp+=~/.vim/bundle/vundle/ + call vundle#rc() + + " let Vundle manage Vundle + Bundle 'gmarik/vundle' + + " My Bundles here: + " + " original repos on github + Bundle 'tpope/vim-fugitive' + Bundle 'lokaltog/vim-easymotion' + Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} + " vim-scripts repos + Bundle 'L9' + Bundle 'FuzzyFinder' + Bundle 'rails.vim' + " non github repos + Bundle 'git://git.wincent.com/command-t.git' + " ... + + filetype plugin indent on " required! + " or + " filetype plugin on " to not use the indentation settings set by plugins + ``` 3. Install configured bundles: @@ -79,11 +83,13 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. **A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexistent repo: - git clone http://github.com/gmarik/non_existin_repo - Cloning into non_existin_repo... - Username: - Password: - fatal: Authentication failed + ```console + git clone http://github.com/gmarik/non_existin_repo + Cloning into non_existin_repo... + Username: + Password: + fatal: Authentication failed + ``` - **Q** My configuration is bundle dependant, so when I try to install plugins for the first time I get errors. How do I fix that? From 3d074f94570fead4f49c84223420f52badf5f0db Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 25 May 2011 21:39:35 -0500 Subject: [PATCH 22/37] indent stuff --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index f2709ab..354560e 100644 --- a/README.md +++ b/README.md @@ -6,42 +6,42 @@ 1. Setup [Vundle]: - ```console - $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle - ``` + ```console + $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + ``` 2. Configure bundles: - Sample `.vimrc`: - - ```vim - set nocompatible " be iMproved - filetype off " required! - - set rtp+=~/.vim/bundle/vundle/ - call vundle#rc() - - " let Vundle manage Vundle - Bundle 'gmarik/vundle' - - " My Bundles here: - " - " original repos on github - Bundle 'tpope/vim-fugitive' - Bundle 'lokaltog/vim-easymotion' - Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} - " vim-scripts repos - Bundle 'L9' - Bundle 'FuzzyFinder' - Bundle 'rails.vim' - " non github repos - Bundle 'git://git.wincent.com/command-t.git' - " ... - - filetype plugin indent on " required! - " or - " filetype plugin on " to not use the indentation settings set by plugins - ``` + Sample `.vimrc`: + + ```vim + set nocompatible " be iMproved + filetype off " required! + + set rtp+=~/.vim/bundle/vundle/ + call vundle#rc() + + " let Vundle manage Vundle + Bundle 'gmarik/vundle' + + " My Bundles here: + " + " original repos on github + Bundle 'tpope/vim-fugitive' + Bundle 'lokaltog/vim-easymotion' + Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} + " vim-scripts repos + Bundle 'L9' + Bundle 'FuzzyFinder' + Bundle 'rails.vim' + " non github repos + Bundle 'git://git.wincent.com/command-t.git' + " ... + + filetype plugin indent on " required! + " or + " filetype plugin on " to not use the indentation settings set by plugins + ``` 3. Install configured bundles: From b67d22b6a6575e4eb601420a509b42b8b72f5daa Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 25 May 2011 21:40:23 -0500 Subject: [PATCH 23/37] more indent --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 354560e..e0b5757 100644 --- a/README.md +++ b/README.md @@ -6,42 +6,42 @@ 1. Setup [Vundle]: - ```console - $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle - ``` + ```console + $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + ``` 2. Configure bundles: - Sample `.vimrc`: - - ```vim - set nocompatible " be iMproved - filetype off " required! - - set rtp+=~/.vim/bundle/vundle/ - call vundle#rc() - - " let Vundle manage Vundle - Bundle 'gmarik/vundle' - - " My Bundles here: - " - " original repos on github - Bundle 'tpope/vim-fugitive' - Bundle 'lokaltog/vim-easymotion' - Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} - " vim-scripts repos - Bundle 'L9' - Bundle 'FuzzyFinder' - Bundle 'rails.vim' - " non github repos - Bundle 'git://git.wincent.com/command-t.git' - " ... - - filetype plugin indent on " required! - " or - " filetype plugin on " to not use the indentation settings set by plugins - ``` + Sample `.vimrc`: + + ```vim + set nocompatible " be iMproved + filetype off " required! + + set rtp+=~/.vim/bundle/vundle/ + call vundle#rc() + + " let Vundle manage Vundle + Bundle 'gmarik/vundle' + + " My Bundles here: + " + " original repos on github + Bundle 'tpope/vim-fugitive' + Bundle 'lokaltog/vim-easymotion' + Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} + " vim-scripts repos + Bundle 'L9' + Bundle 'FuzzyFinder' + Bundle 'rails.vim' + " non github repos + Bundle 'git://git.wincent.com/command-t.git' + " ... + + filetype plugin indent on " required! + " or + " filetype plugin on " to not use the indentation settings set by plugins + ``` 3. Install configured bundles: From 2bd69c17dc465f1c63c346be3af3b4233d081244 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 25 May 2011 21:43:02 -0500 Subject: [PATCH 24/37] fix indent --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e0b5757..cc659d9 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ 3. Install configured bundles: - Launch `vim`, run `:BundleInstall`. + Launch `vim`, run `:BundleInstall`. - *Windows users* see [Vundle for Windows](https://github.com/gmarik/vundle/wiki/Vundle-for-Windows) + *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/`. + Installing requires [Git] and triggers [Git clone](http://gitref.org/creating/#clone) for each configured repo to `~/.vim/bundle/`. ## Why Vundle From 87cc943f3cc0f70ba96c71700c205b42f296ef53 Mon Sep 17 00:00:00 2001 From: gmarik Date: Wed, 25 May 2011 21:47:46 -0500 Subject: [PATCH 25/37] change highlighting from console to shell IMHO looks nicer --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc659d9..519c777 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 1. Setup [Vundle]: - ```console + ```shell $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle ``` @@ -83,7 +83,7 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. **A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexistent repo: - ```console + ```shell git clone http://github.com/gmarik/non_existin_repo Cloning into non_existin_repo... Username: From a17a896ab36f19acf0c8a5486f2ba4139fab1a80 Mon Sep 17 00:00:00 2001 From: gmarik Date: Thu, 26 May 2011 18:21:10 -0500 Subject: [PATCH 26/37] do not use shell lexer - as it doesn't exist --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 519c777..16c9de6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 1. Setup [Vundle]: - ```shell + ``` $ git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle ``` @@ -83,7 +83,7 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details. **A** This is the case of invalid name used with `Bundle`, which leads to attempt to clone nonexistent repo: - ```shell + ``` git clone http://github.com/gmarik/non_existin_repo Cloning into non_existin_repo... Username: From a69866a942c8940b65638a5886ec296fd1646930 Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 27 May 2011 18:56:02 -0500 Subject: [PATCH 27/37] expand bundle path - closes #37 - join is useless there --- autoload/vundle/config.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 96ff8bf..577a6aa 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -77,9 +77,9 @@ endf let s:bundle = {} func! s:bundle.path() - return join([g:bundle_dir, self.name], '/') + return expand(g:bundle_dir.'/'.self.name) endf func! s:bundle.rtpath() - return has_key(self, 'rtp') ? join([self.path(), self.rtp], '/') : self.path() + return has_key(self, 'rtp') ? expand(self.path().'/'.self.rtp) : self.path() endf From 63c3881a793727dcd214d4635a9d636bc1a3310b Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 27 May 2011 19:14:40 -0500 Subject: [PATCH 28/37] fix BundleInstall! on windows - closes #45 - add /d swithc to cd command to perform drive change - eclose joined commands with quotes --- autoload/vundle/installer.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index de4adfe..5ffe564 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -66,6 +66,11 @@ func! s:sync(bang, bundle) abort if isdirectory(git_dir) if !(a:bang) | return 0 | endif let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull' + + 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 else let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) endif From 06088de231d108e5566aa3ed6befe7f564dee7f0 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 28 May 2011 02:55:49 -0500 Subject: [PATCH 29/37] do not break on helptag generation errors - just show the message - closes #46 --- autoload/vundle/installer.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index de4adfe..6a225a2 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -58,7 +58,11 @@ func! s:has_doc(rtp) abort endf func! s:helptags(rtp) abort - helptags `=a:rtp.'/doc/'` + try + helptags `=a:rtp.'/doc/'` + catch + echohl Error | echo "Error generating helptags in ".a:rtp | echohl None + endtry endf func! s:sync(bang, bundle) abort From d840b24072aeef041ff764b5393afee966c36f62 Mon Sep 17 00:00:00 2001 From: Dmitri Iouchtchenko Date: Sun, 29 May 2011 20:07:17 -0400 Subject: [PATCH 30/37] Allow comments after Bundle declarations --- autoload/vundle.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 34ac229..dd36ede 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -4,7 +4,7 @@ " Readme: http://github.com/gmarik/vundle/blob/master/README.md " Version: 0.8 -com! -nargs=+ Bundle +com! -nargs=+ -bar Bundle \ call vundle#config#bundle() com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleInstall From bb402facfb8b8029b0a9d0abb1560abbf168c7b0 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 29 May 2011 21:31:17 -0500 Subject: [PATCH 31/37] Allow comments after Bundle declarations - previous commit closes #13 --- test/vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/vimrc b/test/vimrc index a4f252e..91d0910 100644 --- a/test/vimrc +++ b/test/vimrc @@ -12,11 +12,12 @@ syntax on runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' +" set rtp+=~/.vim/bundle/vundle call vundle#rc(root) -Bundle 'gmarik/vundle' +Bundle 'gmarik/vundle' " Let Vundle manage Vundle " vim-scripts name Bundle 'molokai' From 66a6de721d496520f518dd4163d534971be847ae Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 31 May 2011 19:01:06 -0500 Subject: [PATCH 32/37] Revert "Allow comments after Bundle declarations" This reverts commit d840b24072aeef041ff764b5393afee966c36f62. - makes " quotes unusable --- autoload/vundle.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle.vim b/autoload/vundle.vim index dd36ede..34ac229 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -4,7 +4,7 @@ " Readme: http://github.com/gmarik/vundle/blob/master/README.md " Version: 0.8 -com! -nargs=+ -bar Bundle +com! -nargs=+ Bundle \ call vundle#config#bundle() com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleInstall From c2289ba55cf2dc2880b6b7d084430f9834d1026e Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 31 May 2011 19:01:59 -0500 Subject: [PATCH 33/37] Revert "Allow comments after Bundle declarations" This reverts commit bb402facfb8b8029b0a9d0abb1560abbf168c7b0. --- test/vimrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/vimrc b/test/vimrc index 91d0910..a4f252e 100644 --- a/test/vimrc +++ b/test/vimrc @@ -12,12 +12,11 @@ syntax on runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' -" set rtp+=~/.vim/bundle/vundle call vundle#rc(root) -Bundle 'gmarik/vundle' " Let Vundle manage Vundle +Bundle 'gmarik/vundle' " vim-scripts name Bundle 'molokai' From a4d5fcac977a1d5c81c7ef916eb670d7660de808 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 31 May 2011 19:03:28 -0500 Subject: [PATCH 34/37] test " quotes as well --- test/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/vimrc b/test/vimrc index a4f252e..144f007 100644 --- a/test/vimrc +++ b/test/vimrc @@ -16,7 +16,7 @@ exec 'set rtp+='.root.'/vundle' call vundle#rc(root) -Bundle 'gmarik/vundle' +Bundle "gmarik/vundle" " vim-scripts name Bundle 'molokai' From ac1c89353d9ec92244ad8c5d102ab0d1073c3d87 Mon Sep 17 00:00:00 2001 From: gmarik Date: Tue, 31 May 2011 19:05:27 -0500 Subject: [PATCH 35/37] test --- test/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/vimrc b/test/vimrc index 144f007..e41d1b1 100644 --- a/test/vimrc +++ b/test/vimrc @@ -12,6 +12,7 @@ syntax on runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' +" set rtp+=~/.vim/bundle/vundle call vundle#rc(root) From 063f68b26eed67fd84cd21290e88c974a4df3b7d Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 3 Jun 2011 18:52:04 -0500 Subject: [PATCH 36/37] expand path --- autoload/vundle/config.vim | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 577a6aa..0e32183 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -74,12 +74,16 @@ func! s:rtp_add(dir) abort exec 'set rtp+='.fnameescape(expand(a:dir.'/after')) endf +func! s:expand_path(path) abort + return simplify(expand(a:path)) +endf + let s:bundle = {} func! s:bundle.path() - return expand(g:bundle_dir.'/'.self.name) + return s:expand_path(g:bundle_dir.'/'.self.name) endf func! s:bundle.rtpath() - return has_key(self, 'rtp') ? expand(self.path().'/'.self.rtp) : self.path() + return has_key(self, 'rtp') ? s:expand_path(self.path().'/'.self.rtp) : self.path() endf From 1d0c0ddb5f5abe27fe5a18e740b360e0c8fd9c5b Mon Sep 17 00:00:00 2001 From: gmarik Date: Fri, 3 Jun 2011 18:53:20 -0500 Subject: [PATCH 37/37] test --- test/vimrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/vimrc b/test/vimrc index e41d1b1..ac33de1 100644 --- a/test/vimrc +++ b/test/vimrc @@ -2,8 +2,11 @@ set nocompatible let root = '/tmp/vundle_bundles/' +let src = 'http://github.com/gmarik/vundle.git' +" let src = '~/.vim/bundle/vundle/.git' + if !isdirectory(expand(root).'/vundle') - exec '!git clone http://github.com/gmarik/vundle.git '.root.'/vundle' + exec '!git clone '.src.' '.root.'/vundle' endif filetype off @@ -12,8 +15,6 @@ syntax on runtime macros/matchit.vim exec 'set rtp+='.root.'/vundle' -" set rtp+=~/.vim/bundle/vundle - call vundle#rc(root)