# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1295716411 18000
# Node ID 4537dbfc929a2f484fc57bf0af34d5e9de0d6ef3
# Parent  387e93c23520065a69e55e2a7e827cbc5dd7a77f# Parent  41980dc5753f99711488a4bb8f1c846dbb5361e4
Merge.

diff -r 41980dc5753f -r 4537dbfc929a bootstrap.sh
--- a/bootstrap.sh	Tue Jan 18 15:32:53 2011 -0500
+++ b/bootstrap.sh	Sat Jan 22 12:13:31 2011 -0500
@@ -50,7 +50,7 @@
 
 hg clone bb://sjl/hg-prompt/ "$HOME/lib/hg/hg-prompt"
 hg clone bb://sjl/hg-paste/ "$HOME/lib/hg/hg-paste"
-hg clone bb://sjl/hg-review/ "$HOME/lib/hg/hg-review"
+hg clone bb://sjl/hg-review/ "$HOME/src/hg/hg-review"
 hg clone bb://ccaughie/hgcollapse/ "$HOME/lib/hg/hgcollapse"
 hg clone bb://durin42/histedit/ "$HOME/lib/hg/histedit"
 hg clone bb://durin42/hg-git/ "$HOME/lib/hg/hg-git"
diff -r 41980dc5753f -r 4537dbfc929a mutt/muttrc
--- a/mutt/muttrc	Tue Jan 18 15:32:53 2011 -0500
+++ b/mutt/muttrc	Sat Jan 22 12:13:31 2011 -0500
@@ -6,7 +6,7 @@
 set mailcap_path        = ~/.mutt/mailcap                       # entrys for filetypes
 set signature           = ~/.mutt/sig                           # my signature file
 set tmpdir              = ~/.mutt/temp                          # where to keep temp files
-set editor              = "mvim -f +/^$ +:noh"                  # use vim and skip to first blank line
+set editor              = "vim +/^$ +:noh"                  # use vim and skip to first blank line
 set print_command       = /usr/bin/enscript                     # print with enscript
 
 # main options
diff -r 41980dc5753f -r 4537dbfc929a vim/.vimrc
--- a/vim/.vimrc	Tue Jan 18 15:32:53 2011 -0500
+++ b/vim/.vimrc	Sat Jan 22 12:13:31 2011 -0500
@@ -142,6 +142,8 @@
 
 " Various filetype-specific stuff
 
+au BufNewFile,BufRead *.clj nmap <localleader>ee 0;\et
+
 au BufNewFile,BufRead *.html setlocal filetype=htmldjango
 au BufNewFile,BufRead *.html setlocal foldmethod=manual
 au BufNewFile,BufRead *.html nnoremap <buffer> <localleader>f Vatzf