bb3bbf24cabb

--- a/.hgsubstate	Sun Nov 04 13:30:46 2012 -0500
+++ b/.hgsubstate	Sun Nov 04 13:30:53 2012 -0500
@@ -20,7 +20,7 @@
 49ae47e66f51c92b0f467f9817d5d8745f627132 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
 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice

--- a/vim/vimrc	Sun Nov 04 13:30:46 2012 -0500
+++ b/vim/vimrc	Sun Nov 04 13:30:53 2012 -0500
@@ -598,9 +598,6 @@
 "     endif
 " endfunction
 
-let g:slimv_leader = '\'
-let g:slimv_keybindings = 2
-
 augroup ft_clojure
     au!
 
@@ -812,10 +809,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
 
 " }}}
@@ -1022,6 +1026,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
@@ -1232,12 +1237,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'