# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1352053884 18000
# Node ID 37efa216507c5b24d7386238cf83ad4dabc1eca7
# Parent  bb3bbf24cabbd8cdacb0492f1c873ac786f1b2bb# Parent  f4c88441426f8f7336b258939e704ebeda292f39
Merge.

diff -r f4c88441426f -r 37efa216507c .hgsubstate
--- a/.hgsubstate	Sat Nov 03 18:11:21 2012 -0400
+++ b/.hgsubstate	Sun Nov 04 13:31:24 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 f4c88441426f -r 37efa216507c dotcss/refheap.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/refheap.com.css	Sun Nov 04 13:31:24 2012 -0500
@@ -0,0 +1,4 @@
+pre {
+    font-family: Menlo;
+    font-size: 14px;
+}
diff -r f4c88441426f -r 37efa216507c vim/vimrc
--- a/vim/vimrc	Sat Nov 03 18:11:21 2012 -0400
+++ b/vim/vimrc	Sun Nov 04 13:31:24 2012 -0500
@@ -621,9 +621,6 @@
 "     endif
 " endfunction
 
-let g:slimv_leader = '\'
-let g:slimv_keybindings = 2
-
 augroup ft_clojure
     au!
 
@@ -835,10 +832,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
 
 " }}}
@@ -1047,6 +1051,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
@@ -1258,12 +1263,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'