changeset 96:4c2c0fadab01

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 27 Mar 2012 20:31:33 -0700
parents b96ff0dd0137 (diff) 9bf866c0bbb1 (current diff)
children e6ecdb8ef62f
files
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/install.cmd	Tue Mar 27 17:06:27 2012 -0700
+++ b/install.cmd	Tue Mar 27 20:31:33 2012 -0700
@@ -13,7 +13,7 @@
     set /P confirm=Will delete existing "%userprofile%\_vimrc". OK with that? Press CTRL-C to abort.
     del /Q "%userprofile%\_vimrc"
 )
-echo set runtimepath=%CWD:\=/%vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,%CWD:\=/%vim/after > "%userprofile%\_vimrc"
+echo set runtimepath+=%CWD:\=/%vim > "%userprofile%\_vimrc"
 echo source %CWD:\=/%vim/vimrc >> "%userprofile%\_vimrc"
 
 :: Mercurial Files
--- a/install.sh	Tue Mar 27 17:06:27 2012 -0700
+++ b/install.sh	Tue Mar 27 20:31:33 2012 -0700
@@ -9,8 +9,8 @@
 
 # VIM
 # ---
-ln -s "$CWD/vim"        "$HOME/.vim"
-ln -s "$CWD/vim/vimrc"  "$HOME/.vimrc"
+echo set runtimepath+=$CWD/vim > "$HOME/.vimrc"
+echo source $CWD/vim/vimrc >> "$HOME/.vimrc"
 
 # MERCURIAL
 # ---------
--- a/vim/vimrc	Tue Mar 27 17:06:27 2012 -0700
+++ b/vim/vimrc	Tue Mar 27 20:31:33 2012 -0700
@@ -27,7 +27,7 @@
 endif
 
 " Get our vim directory. 
-let s:vim_home=expand("<sfile>:h")
+let s:vim_home = expand("<sfile>:h")
 
 " Disable some plugins.
 let g:pathogen_disabled = []