# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1333219235 25200
# Node ID 41fce97dd6d4b046306082a338084aa6338e852b
# Parent  7985d8397afa35e05a347946ce41f2840fe06f7e# Parent  351a7ca0b7d61fcc0ed19dfda80ee2b055e2f02c
Merged changes

diff -r 351a7ca0b7d6 -r 41fce97dd6d4 .hgsub
--- a/.hgsub	Fri Mar 30 15:31:13 2012 -0700
+++ b/.hgsub	Sat Mar 31 11:40:35 2012 -0700
@@ -20,6 +20,7 @@
 vim/bundle/syntastic = [git]https://github.com/scrooloose/syntastic.git
 
 vim/bundle/lawrencium = ssh://hg@bitbucket.org/ludovicchabant/vim-lawrencium
+vim/bundle/piecrust = ssh://hg@bitbucket.org/ludovicchabant/vim-piecrust
 
 lib/hg/hg-git = ssh://hg@bitbucket.org/durin42/hg-git
 lib/hg/onsub = ssh://hg@bitbucket.org/ludovicchabant/onsub
diff -r 351a7ca0b7d6 -r 41fce97dd6d4 .hgsubstate
--- a/.hgsubstate	Fri Mar 30 15:31:13 2012 -0700
+++ b/.hgsubstate	Sat Mar 31 11:40:35 2012 -0700
@@ -11,6 +11,7 @@
 a63ec818ab216a535258e6ba25596bbb5762421e vim/bundle/lawrencium
 fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da vim/bundle/markdown
 678bb2816874d92bca4eea46e0f5f40a15ddab68 vim/bundle/nerdtree
+d09875b9f1000bf8dac7333985fd3f9786ef1344 vim/bundle/piecrust
 99277d9eed97a59cacc1db8c1dece2bcfd96d877 vim/bundle/powerline
 1b82b6726c9894acd37b70ec1cd451d412bdb0f7 vim/bundle/ragtag
 2914f11f7494adefaaec1d8c817a301c464c94b2 vim/bundle/repeat
diff -r 351a7ca0b7d6 -r 41fce97dd6d4 install.cmd
--- a/install.cmd	Fri Mar 30 15:31:13 2012 -0700
+++ b/install.cmd	Sat Mar 31 11:40:35 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 351a7ca0b7d6 -r 41fce97dd6d4 install.sh
--- a/install.sh	Fri Mar 30 15:31:13 2012 -0700
+++ b/install.sh	Sat Mar 31 11:40:35 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 351a7ca0b7d6 -r 41fce97dd6d4 vim/vimrc
--- a/vim/vimrc	Fri Mar 30 15:31:13 2012 -0700
+++ b/vim/vimrc	Sat Mar 31 11:40:35 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 = []