# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1333083192 25200
# Node ID e6ecdb8ef62f46d4373e1044d4d85ec3a573ae01
# Parent  4c2c0fadab016d381e81da2c54cd6a1ec861b81f# Parent  822fc8b4405f1628eb317c42ec22c5b098af436e
Merged changes.

diff -r 822fc8b4405f -r e6ecdb8ef62f install.cmd
--- a/install.cmd	Thu Mar 29 16:25:18 2012 -0700
+++ b/install.cmd	Thu Mar 29 21:53:12 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 822fc8b4405f -r e6ecdb8ef62f install.sh
--- a/install.sh	Thu Mar 29 16:25:18 2012 -0700
+++ b/install.sh	Thu Mar 29 21:53:12 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 822fc8b4405f -r e6ecdb8ef62f vim/vimrc
--- a/vim/vimrc	Thu Mar 29 16:25:18 2012 -0700
+++ b/vim/vimrc	Thu Mar 29 21:53:12 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 = []