Permalink
Browse files

Merge.

  • Loading branch information...
2 parents 83569ae + 815ed42 commit 4f6ec0d97bc9e9c0ae883ca2336cffc87f3c365f @sjl committed Nov 4, 2012
Showing with 17 additions and 7 deletions.
  1. +1 −1 .hgsubstate
  2. +4 −0 dotcss/refheap.com.css
  3. +12 −6 vim/vimrc
View
@@ -20,7 +20,7 @@ f45b4529dd282393f2e08306ae161d77de0051a0 vim/bundle/orgmode
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
View
@@ -0,0 +1,4 @@
+pre {
+ font-family: Menlo;
+ font-size: 14px;
+}
View
@@ -622,9 +622,6 @@ augroup END
" endif
" endfunction
-let g:slimv_leader = '\'
-let g:slimv_keybindings = 2
-
augroup ft_clojure
au!
@@ -837,10 +834,17 @@ augroup ft_lisp
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
" }}}
@@ -1049,6 +1053,7 @@ augroup plugin_commentary
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
@@ -1260,12 +1265,13 @@ nnoremap <silent> <leader><tab> :ScratchToggle<cr>
" }}}
" 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'

0 comments on commit 4f6ec0d

Please sign in to comment.