52dab2e4da1c
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Wed, 21 Nov 2012 15:53:19 -0500 |
parents | a4e75d5bbcb0 (current diff) 2eb1626ba696 (diff) |
children | c209d46146e4 |
branches/tags | (none) |
files | fish/config.fish vim/vimrc |
Changes
--- a/.hgsubstate Wed Nov 21 15:52:57 2012 -0500 +++ b/.hgsubstate Wed Nov 21 15:53:19 2012 -0500 @@ -20,7 +20,7 @@ cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt -ff17714c2ee46fc752b28511673b8aa4ea8ba174 vim/bundle/slimv +af6e47368c031688cd50c10d4dc376be49ecb29f vim/bundle/slimv 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 22feac7bc42467a8b17c8b833bd24f36b02759a4 vim/bundle/splice
--- a/fish/config.fish Wed Nov 21 15:52:57 2012 -0500 +++ b/fish/config.fish Wed Nov 21 15:53:19 2012 -0500 @@ -9,7 +9,7 @@ alias paththis 'set PATH (pwd) $PATH' alias clc './bin/get-last-commit-url.py | pbcopy' -alias swank 'dtach -A /tmp/dtach-swank.sock -r winch lein swank' +alias swank 'dtach -A /tmp/dtach-swank.sock -r winch lein ritz' alias ef 'vim ~/.config/fish/config.fish' alias ev 'vim ~/.vimrc'
--- a/vim/custom-dictionary.utf-8.add Wed Nov 21 15:52:57 2012 -0500 +++ b/vim/custom-dictionary.utf-8.add Wed Nov 21 15:53:19 2012 -0500 @@ -114,6 +114,7 @@ repos plugin's VCS +Vimscript's namespacing autocommands autocommand
--- a/vim/vimrc Wed Nov 21 15:52:57 2012 -0500 +++ b/vim/vimrc Wed Nov 21 15:53:19 2012 -0500 @@ -622,6 +622,14 @@ " endif " endfunction +function! s:DebullshitClojureStacktrace() " {{{ + syntax match GarbageFrame '\v^ +\d+:.+:\d+ clojure\..+$' + syntax match GarbageFrame '\v^ +\d+:.+:\d+ swank\..+$' + hi link GarbageFrame Comment +endfunction " }}} + +command! -nargs=0 DebullshitClojureStacktrace call s:DebullshitClojureStacktrace() + augroup ft_clojure au! @@ -1271,7 +1279,9 @@ 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' +let g:slimv_swank_clojure = '!dtach -n /tmp/dtach-swank.sock -r winch lein ritz 4005' +" let g:slimv_swank_clojure = '! xterm -e lein ritz 4005 &' +let g:slimv_swank_clojure = '!false' " }}}} " Sparkup {{{