Permalink
Browse files

merge

  • Loading branch information...
2 parents 02d00dd + a4bb368 commit ea26758d7a839693b6f68a65d7c133a9dc52cb77 @jaybperry jaybperry committed May 10, 2012
Showing with 11 additions and 9 deletions.
  1. +6 −6 .gitmodules
  2. +1 −0 vim/bundle/NERD-tree
  3. +0 −1 vim/bundle/nerd-tree
  4. +1 −0 vim/bundle/vim-symfony
  5. +3 −2 vimrc
View
@@ -1,6 +1,3 @@
-[submodule "vim/bundle/nerd-tree"]
- path = vim/bundle/nerd-tree
- url = https://github.com/vim-scripts/The-NERD-tree.git
[submodule "vim/bundle/molokai"]
path = vim/bundle/molokai
url = https://github.com/tomasr/molokai
@@ -16,9 +13,6 @@
[submodule "vim/bundle/zencoding"]
path = vim/bundle/zencoding
url = https://github.com/mattn/zencoding-vim
-[submodule "vim/bundle/symfony"]
- path = vim/bundle/symfony
- url = https://github.com/soh335/vim-symfony.git
[submodule "vim/bundle/snipmate-symfony"]
path = vim/bundle/snipmate-symfony
url = https://github.com/soh335/vim-symfony-snipmate.git
@@ -88,3 +82,9 @@
[submodule "vim/bundle/vim-indent-guides"]
path = vim/bundle/vim-indent-guides
url = https://github.com/nathanaelkane/vim-indent-guides
+[submodule "vim/bundle/NERD-tree"]
+ path = vim/bundle/NERD-tree
+ url = https://github.com/vim-scripts/The-NERD-tree.git
+[submodule "vim/bundle/vim-symfony"]
+ path = vim/bundle/vim-symfony
+ url = https://github.com/soh335/vim-symfony.git
Submodule NERD-tree added at af65bd
Submodule nerd-tree deleted from e3a80b
Submodule vim-symfony added at cf3410
View
5 vimrc
@@ -407,12 +407,13 @@ cmap w!! w !sudo tee % > /dev/null
set path=$PWD/**
"command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis | wincmd p | diffthis
-
-python << EOF
+if has('python')
+ python << EOF
import os
import sys
import vim
for p in sys.path:
if os.path.isdir(p):
vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
EOF
+endif

0 comments on commit ea26758

Please sign in to comment.