da50e176229c

--- a/.hgsubstate	Wed Aug 03 16:45:59 2011 -0400
+++ b/.hgsubstate	Wed Aug 03 17:20:40 2011 -0400
@@ -8,7 +8,7 @@
 b28e7be63235982501ab7dd30c03ea7feef7b095 vim/bundle/nerdcommenter
 2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
 fd814c429e5269da10df87429b62c570617456f2 vim/bundle/pydoc
-696376b05dbbcf348f89480d9834339888afbaa4 vim/bundle/slimv
+b939d2714290c09e9281164e7777ecc0f9214a48 vim/bundle/slimv
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7 vim/bundle/surround

--- a/vim/.vimrc	Wed Aug 03 16:45:59 2011 -0400
+++ b/vim/.vimrc	Wed Aug 03 17:20:40 2011 -0400
@@ -47,6 +47,8 @@
 set splitright
 set fillchars=diff:\ 
 set ttimeout
+set notimeout
+set nottimeout
 
 " Make Vim able to edit crontab files again.
 set backupskip=/tmp/*,/private/tmp/*" 
@@ -262,6 +264,9 @@
 " Indent top-level form.
 au FileType clojure nmap <buffer> <localleader>= v((((((((((((=%
 
+" Use a swank command that works, and doesn't require new app windows.
+au FileType clojure let g:slimv_swank_cmd='!dtach -n /tmp/dvtm-swank.sock -r winch lein swank'
+
 " }}}
 " Confluence {{{
 

--- a/zsh/misc.zsh	Wed Aug 03 16:45:59 2011 -0400
+++ b/zsh/misc.zsh	Wed Aug 03 17:20:40 2011 -0400
@@ -75,6 +75,7 @@
 
 alias dv='dvtm -m "^f"'
 alias dvt='dtach -A /tmp/dvtm-session.sock -r winch dvtm -m "^f"'
+alias swank='dtach -A /tmp/dvtm-swank.sock -r winch lein swank'
 
 alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*'