Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Switched from Pathogen to Vundle.

  • Loading branch information...
commit 75c45c63391b653eb931776769da1e8f2cf0d0d1 1 parent 7960a41
Jason Diamond authored
1  .gitignore
... ... @@ -1 +1,2 @@
  1 +bundle
1 2 .netrwhist
57 .gitmodules
... ... @@ -1,54 +1,3 @@
1   -[submodule "bundles/argtextobj.vim"]
2   - path = bundles/argtextobj.vim
3   - url = https://github.com/vim-scripts/argtextobj.vim.git
4   -[submodule "bundles/camelcasemotion"]
5   - path = bundles/camelcasemotion
6   - url = https://github.com/vim-scripts/camelcasemotion.git
7   - ignore = untracked
8   -[submodule "bundles/DetectIndent"]
9   - path = bundles/DetectIndent
10   - url = https://github.com/vim-scripts/DetectIndent.git
11   - ignore = untracked
12   -[submodule "bundles/vim-blackboard"]
13   - path = bundles/vim-blackboard
14   - url = https://github.com/nelstrom/vim-blackboard.git
15   -[submodule "bundles/vim-surround"]
16   - path = bundles/vim-surround
17   - url = https://github.com/tpope/vim-surround.git
18   - ignore = untracked
19   -[submodule "bundles/vim-unimpaired"]
20   - path = bundles/vim-unimpaired
21   - url = https://github.com/tpope/vim-unimpaired.git
22   - ignore = untracked
23   -[submodule "bundles/delimitMate"]
24   - path = bundles/delimitMate
25   - url = https://github.com/Raimondi/delimitMate.git
26   -[submodule "bundles/nerdtree"]
27   - path = bundles/nerdtree
28   - url = https://github.com/scrooloose/nerdtree.git
29   -[submodule "bundles/matchit"]
30   - path = bundles/matchit
31   - url = https://github.com/vim-scripts/matchit.zip.git
32   - ignore = untracked
33   -[submodule "bundles/supertab"]
34   - path = bundles/supertab
35   - url = https://github.com/ervandew/supertab.git
36   -[submodule "bundles/snipmate"]
37   - path = bundles/snipmate
38   - url = https://github.com/msanders/snipmate.vim.git
39   - ignore = untracked
40   -[submodule "bundles/vim-makegreen"]
41   - path = bundles/vim-makegreen
42   - url = https://github.com/reinh/vim-makegreen.git
43   -[submodule "bundles/tcomment_vim"]
44   - path = bundles/tcomment_vim
45   - url = https://github.com/tomtom/tcomment_vim.git
46   -[submodule "bundles/vim-colors-solarized"]
47   - path = bundles/vim-colors-solarized
48   - url = https://github.com/altercation/vim-colors-solarized.git
49   -[submodule "bundles/open-browser.vim"]
50   - path = bundles/open-browser.vim
51   - url = https://github.com/tyru/open-browser.vim.git
52   -[submodule "bundles/vim-fugitive"]
53   - path = bundles/vim-fugitive
54   - url = https://github.com/tpope/vim-fugitive.git
  1 +[submodule "vundle"]
  2 + path = vundle
  3 + url = https://github.com/gmarik/vundle.git
1  bundles/DetectIndent
... ... @@ -1 +0,0 @@
1   -Subproject commit befd4126b9a98c58a254ad7ccc05a053442aad67
1  bundles/argtextobj.vim
... ... @@ -1 +0,0 @@
1   -Subproject commit f3fbe427f7b4ec436416a5816d714dc917dc530b
1  bundles/camelcasemotion
... ... @@ -1 +0,0 @@
1   -Subproject commit e810454eb3d60f8f461cf7e1b8f9ab0337148d3e
1  bundles/delimitMate
... ... @@ -1 +0,0 @@
1   -Subproject commit d0fc1456b7ff424311be65bb17e697dcb87ebe18
1  bundles/matchit
... ... @@ -1 +0,0 @@
1   -Subproject commit ced6c409c9beeb0b4142d21906606bd194411d1d
1  bundles/nerdtree
... ... @@ -1 +0,0 @@
1   -Subproject commit 7650cdc6621cd15b047dc04605b8b0bc0396564d
1  bundles/open-browser.vim
... ... @@ -1 +0,0 @@
1   -Subproject commit f3616ab8aa4e4caf54ee23fa390e4e4ac787bfb4
1  bundles/snipmate
... ... @@ -1 +0,0 @@
1   -Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
1  bundles/supertab
... ... @@ -1 +0,0 @@
1   -Subproject commit 5edeb681fd780be3477c0ebea75716625b7b6582
1  bundles/tcomment_vim
... ... @@ -1 +0,0 @@
1   -Subproject commit 12bb928024f3a78226135808695f59ca8c78f737
1  bundles/vim-blackboard
... ... @@ -1 +0,0 @@
1   -Subproject commit c216b4355d4ece0b0868d621c60dd221e7751b0f
1  bundles/vim-colors-solarized
... ... @@ -1 +0,0 @@
1   -Subproject commit bc35c899ec8ef23d481a95028b93ec50b04bd16c
1  bundles/vim-fugitive
... ... @@ -1 +0,0 @@
1   -Subproject commit 5e25040a97580845348ea5f853085088c4840ba9
1  bundles/vim-makegreen
... ... @@ -1 +0,0 @@
1   -Subproject commit c778231becd7e795e3272fcc464e0c945891841f
1  bundles/vim-surround
... ... @@ -1 +0,0 @@
1   -Subproject commit 27710a2224d6dd0486d1c40d09ef18dd752e7d37
1  bundles/vim-unimpaired
... ... @@ -1 +0,0 @@
1   -Subproject commit 9b898d31988640f2bbc07fc35f588bd1247ffa33
4 gvimrc
... ... @@ -1,6 +1,8 @@
1 1 " Set the font.
2 2 set guifont=Consolas:h12:cANSI
3 3
  4 +set background=dark
  5 +
4 6 " Set the colorscheme.
5   -colorscheme blackboard
  7 +silent! colorscheme solarized
6 8
72 vimrc
@@ -7,13 +7,20 @@ set nocompatible
7 7 set runtimepath^=~/.vim
8 8 set runtimepath+=~/.vim/after
9 9
10   -" Pathogen docs suggest turning filetype off at first.
  10 +" Vundle docs require turning filetype off at first.
11 11 filetype off
12 12
13   -" Append the bundle directories to the runtimepath.
14   -call pathogen#runtime_append_all_bundles('bundles')
  13 +" Turn on Vundle.
  14 +set rtp+=~/.vim/vundle/
  15 +call vundle#rc()
15 16
16   -" Enable filetype detection. Must be after Pathogen call.
  17 +" Bundles go here.
  18 +Bundle 'DetectIndent'
  19 +Bundle 'altercation/vim-colors-solarized'
  20 +Bundle 'kien/ctrlp.vim'
  21 +Bundle 'kchmck/vim-coffee-script'
  22 +
  23 +" Enable filetype detection. Must be after bundlers get added.
17 24 filetype plugin indent on
18 25
19 26 " Hitting the , key is more convenient than \ key.
@@ -121,9 +128,6 @@ set textwidth=79 " Wrap lines at column 79.
121 128 set nojoinspaces " Don't add two spaces at the end of sentences.
122 129 set colorcolumn=81 " Show a line at column 81.
123 130
124   -" Shortcut for opening NERDTree.
125   -noremap <silent><Leader>f :NERDTreeToggle<CR>
126   -
127 131 " Set tabstop, softtabstop and shiftwidth to the same value {{{
128 132 " From http://vimcasts.org/episodes/tabs-and-spaces/
129 133 command! -nargs=* Stab call Stab()
@@ -188,59 +192,6 @@ endfunction
188 192
189 193 " }}}
190 194
191   -" Bubbling text {{{
192   -
193   -" http://vimcasts.org/episodes/bubbling-text/
194   -" Uses vim-unimpaired: http://github.com/tpope/vim-unimpaired
195   -
196   -" Bubble single lines.
197   -nmap <C-Up> [e
198   -nmap <C-Down> ]e
199   -
200   -" Bubble multiple lines.
201   -vmap <C-Up> [egv
202   -vmap <C-Down> ]egv
203   -" }}}
204   -
205   -" View in browser {{{
206   -
207   -" Tell the openbrowser plugin to *not* open files in Vim.
208   -let g:openbrowser_open_filepath_in_vim = 0
209   -
210   -nnoremap <leader>v :call ViewFileInBrowser()<CR>
211   -nnoremap <leader>V :call SetFileToViewInBrowser()<CR>
212   -
213   -function! ViewFileInBrowser()
214   - if exists('g:filetoview')
215   - call OpenFileInBrowser(g:filetoview)
216   - else
217   - call SetFileToViewInBrowser()
218   - endif
219   -endfunction
220   -
221   -function! SetFileToViewInBrowser()
222   - if &buftype == 'nofile' || &buftype == 'quickfix' || &buftype == 'help'
223   - return
224   - endif
225   - let l:choice = confirm('Set "' . expand('%') . '" as the default file to view from now on?', "&Yes, set this file as the default and view it\n&No, just view this file")
226   - if l:choice == 0
227   - return
228   - endif
229   - if l:choice == 1
230   - let g:filetoview = expand('%:p')
231   - endif
232   - call OpenFileInBrowser(expand('%p'))
233   -endfunction
234   -
235   -function! OpenFileInBrowser(file)
236   - if &modified
237   - write
238   - endif
239   - call openbrowser#open(a:file)
240   -endfunction
241   -
242   -" }}}
243   -
244 195 let g:snippets_dir = '~/.vim/snippets'
245 196
246 197 " FileType Auto Commands {{{
@@ -272,3 +223,4 @@ augroup AllAutoCommands
272 223 augroup END
273 224
274 225 " }}}
  226 +
1  vundle
... ... @@ -0,0 +1 @@
  1 +Subproject commit 37e82d1e181ea7943d20061d63dd132184f9f602

0 comments on commit 75c45c6

Please sign in to comment.
Something went wrong with that request. Please try again.