Skip to content
Browse files

using new fork of snipmate

  • Loading branch information...
1 parent 6a1ce18 commit d2c0534258ac9f43ae39f59954b98bad41ed7d84 @jaybperry jaybperry committed May 6, 2012
Showing with 20 additions and 7 deletions.
  1. +12 −6 .gitmodules
  2. +0 −1 vim/bundle/snipmate-django
  3. +1 −0 vim/bundle/snipmate-snippets
  4. +1 −0 vim/bundle/tlib_vim
  5. +1 −0 vim/bundle/vim-addon-mw-utils
  6. +5 −0 vimrc
View
18 .gitmodules
@@ -19,12 +19,6 @@
[submodule "vim/bundle/zencoding"]
path = vim/bundle/zencoding
url = https://github.com/mattn/zencoding-vim
-[submodule "vim/bundle/snipmate"]
- path = vim/bundle/snipmate
- url = https://github.com/msanders/snipmate.vim.git
-[submodule "vim/bundle/snipmate-django"]
- path = vim/bundle/snipmate-django
- url = https://github.com/strycore/snipmate_for_django.git
[submodule "vim/bundle/symfony"]
path = vim/bundle/symfony
url = https://github.com/soh335/vim-symfony.git
@@ -70,3 +64,15 @@
[submodule "vim/bundle/ctrlp"]
path = vim/bundle/ctrlp
url = https://github.com/kien/ctrlp.vim.git
+[submodule "vim/bundle/snipmate"]
+ path = vim/bundle/snipmate
+ url = git://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/tlib_vim"]
+ path = vim/bundle/tlib_vim
+ url = https://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/vim-addon-mw-utils"]
+ path = vim/bundle/vim-addon-mw-utils
+ url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/snipmate-snippets"]
+ path = vim/bundle/snipmate-snippets
+ url = https://github.com/MarcWeber/vim-addon-mw-utils.git
1 vim/bundle/snipmate-django
@@ -1 +0,0 @@
-Subproject commit 39aac014d8e1f3feecaef3cff9352bad478f94e0
1 vim/bundle/snipmate-snippets
@@ -0,0 +1 @@
+Subproject commit d1bfbc589944fcb84af887aec79074d80a327f4c
1 vim/bundle/tlib_vim
@@ -0,0 +1 @@
+Subproject commit 4bfa2df5cfe9a139d65ab9a3ca1609623e968b90
1 vim/bundle/vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit d1bfbc589944fcb84af887aec79074d80a327f4c
View
5 vimrc
@@ -225,6 +225,10 @@ map <silent> <S-F8> :w<CR>:make<CR>:cw<CR>
map <leader>j :RopeGotoDefinition<CR>
map <leader>r :RopeRename<CR>
+" CtrlP configuration
+
+let g:ctrlp_working_path_mode = 2
+
" Disable ex mode
map Q <Nop>
" Map :w< to :w because my fingers slip
@@ -239,6 +243,7 @@ set omnifunc=syntaxcomplete#Complete
if has('autocmd')
autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab "Makefiles require hard tabs
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+ autocmd FileType ruby setlocal ts=2 sts=2 sw=2 expandtab
autocmd FileType php setlocal ts=2 sts=2 sw=2 expandtab
autocmd FileType html setlocal ts=2 sts=2 sw=2 expandtab

0 comments on commit d2c0534

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