# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1352058640 18000
# Node ID 0adce74bc3ef189276a1145d685842a12b88c819
# Parent  f60c11e424db6ffdb5d3a70fe2551e65dbba7387# Parent  37efa216507c5b24d7386238cf83ad4dabc1eca7
Merge.

diff -r f60c11e424db -r 0adce74bc3ef .hgsubstate
--- a/.hgsubstate	Sun Nov 04 14:50:28 2012 -0500
+++ b/.hgsubstate	Sun Nov 04 14:50:40 2012 -0500
@@ -20,7 +20,7 @@
 cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
-b1591aa1c7057c163bf5d7dd552f044422667bc2 vim/bundle/slimv
+eba3ea3cecc57cb3d10635a208c245d46850ddc3 vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 22feac7bc42467a8b17c8b833bd24f36b02759a4 vim/bundle/splice
diff -r f60c11e424db -r 0adce74bc3ef dotcss/refheap.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/refheap.com.css	Sun Nov 04 14:50:40 2012 -0500
@@ -0,0 +1,4 @@
+pre {
+    font-family: Menlo;
+    font-size: 14px;
+}
diff -r f60c11e424db -r 0adce74bc3ef vim/vimrc
--- a/vim/vimrc	Sun Nov 04 14:50:28 2012 -0500
+++ b/vim/vimrc	Sun Nov 04 14:50:40 2012 -0500
@@ -622,9 +622,6 @@
 "     endif
 " endfunction
 
-let g:slimv_leader = '\'
-let g:slimv_keybindings = 2
-
 augroup ft_clojure
     au!
 
@@ -837,10 +834,17 @@
     au!
     au FileType lisp call TurnOnLispFolding()
     " au FileType lisp nnoremap <buffer> <localleader>ee mz99[(va("ry:call Send_to_Tmux(@r)<cr>
-    au FileType lisp nnoremap <buffer> <localleader>ee mz99[(:call SlimvEvalExp()<cr>`z
+    " au FileType lisp nnoremap <buffer> <localleader>ee mz99[(:call SlimvEvalExp()<cr>`z
+
+    " Fix the eval mappings.
+    au FileType lisp nnoremap <buffer> <localleader>ef :call SlimvEvalExp()<cr>
+    au FileType lisp nnoremap <buffer> <localleader>ee :call SlimvEvalDefun()<cr>
 
     au FileType lisp nnoremap <buffer> <localleader>tt mz0l99[(vab"ry:call Send_to_Tmux(@r)<cr>`z
     au FileType lisp nnoremap <buffer> <localleader>tb mzggVG"ry:call Send_to_Tmux(@r)<cr>`z
+
+    " Indent top-level form.
+    au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z
 augroup END
 
 " }}}
@@ -1049,6 +1053,7 @@
     au!
     au FileType htmldjango setlocal commentstring={#\ %s\ #}
     au FileType clojurescript setlocal commentstring=;\ %s
+    au FileType lisp setlocal commentstring=;\ %s
     au FileType puppet setlocal commentstring=#\ %s
     au FileType fish setlocal commentstring=#\ %s
 augroup END
@@ -1260,12 +1265,13 @@
 " }}}
 " SLIMV {{{
 
+let g:slimv_leader = '\'
+let g:slimv_keybindings = 2
 let g:slimv_repl_name = 'SLIMV.REPL'
 let g:slimv_repl_split = 4
 " let g:slimv_repl_syntax = 0
 let g:slimv_repl_wrap = 0
-
-" let g:paredit_mode = 0
+let g:slimv_preferred = 'clisp'
 
 " Use a swank command that works, and doesn't require new app windows.
 let g:slimv_swank_clojure = '!dtach -n /tmp/dtach-swank.sock -r winch lein swank'