# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1295888554 18000
# Node ID def83f37f73e7b6ee2f49dce3dab2f3f070d43e5
# Parent  de8edd7538a2f7cbeccf7e444d7e4517824f591f# Parent  d0cba311bdc468c49d884564d3b296fc89af3cae
Merge.

diff -r de8edd7538a2 -r def83f37f73e bootstrap.sh
--- a/bootstrap.sh	Mon Jan 24 12:00:39 2011 -0500
+++ b/bootstrap.sh	Mon Jan 24 12:02:34 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 de8edd7538a2 -r def83f37f73e mutt/muttrc
--- a/mutt/muttrc	Mon Jan 24 12:00:39 2011 -0500
+++ b/mutt/muttrc	Mon Jan 24 12:02:34 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 de8edd7538a2 -r def83f37f73e vim/.vimrc
--- a/vim/.vimrc	Mon Jan 24 12:00:39 2011 -0500
+++ b/vim/.vimrc	Mon Jan 24 12:02:34 2011 -0500
@@ -31,6 +31,7 @@
 set laststatus=2
 set undofile
 set undoreload=10000
+set cpoptions+=J
 
 " Status line
 set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c)
@@ -142,6 +143,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