# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1332905493 25200
# Node ID 4c2c0fadab016d381e81da2c54cd6a1ec861b81f
# Parent  b96ff0dd01377bed67b58a42cf9f2e22d1862ff5# Parent  9bf866c0bbb1fa1f43409b66b510fd376bff53d7
Merged changes.

diff -r 9bf866c0bbb1 -r 4c2c0fadab01 install.cmd
--- 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
diff -r 9bf866c0bbb1 -r 4c2c0fadab01 install.sh
--- 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
 # ---------
diff -r 9bf866c0bbb1 -r 4c2c0fadab01 vim/vimrc
--- 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 = []