# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1392491967 18000
# Node ID 7fe54290c1359c62bde26db8f5f8cb4c017a3c72
# Parent  80eba4a6004da6dde77e79bc5b4b181c108c899d
shit

diff -r 80eba4a6004d -r 7fe54290c135 vim/vimrc
--- a/vim/vimrc	Fri Feb 14 21:37:00 2014 -0500
+++ b/vim/vimrc	Sat Feb 15 14:19:27 2014 -0500
@@ -766,10 +766,25 @@
 function! SendToTmuxStripped(text)
     call SendToTmux(substitute(a:text, '\v\n*$', '', ''))
 endfunction
+function! SetLispWords()
+    if exists("g:did_set_lisp_words")
+        return
+    endif
+
+    let g:did_set_lisp_words = 1
+
+    set lispwords+=switch
+    set lispwords+=cswitch
+    set lispwords+=eswitch
+endfunction
 
 augroup ft_commonlisp
     au!
 
+    au BufNewFile,BufRead *.asd setfiletype lisp
+
+    au FileType lisp call SetLispWords()
+
     " Set up some basic tslime mappings until I shave the fuckin
     " Fireplace/Common Lisp yak.
     "
@@ -784,7 +799,7 @@
     au FileType lisp nnoremap <buffer> <silent> <localleader>f :let lisp_tslime_view = winsaveview()<cr>vab"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
 
     " Send the current top-level form to the REPL
-    au FileType lisp nnoremap <buffer> <silent> <localleader>e :let lisp_tslime_view = winsaveview()<cr>l:call PareditFindDefunBck()<cr>vab"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
+    au FileType lisp nnoremap <buffer> <silent> <localleader>e :let lisp_tslime_view = winsaveview()<cr>:silent! normal! l<cr>:call PareditFindDefunBck()<cr>vab"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
 
     " Send the entire buffer to the REPL
     au FileType lisp nnoremap <buffer> <silent> <localleader>r :let lisp_tslime_view = winsaveview()<cr>ggVG"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>