# HG changeset patch # User Steve Losh # Date 1372808857 25200 # Node ID 1b974520d9d7157d81e16ea39ede7bc3c19c534c # Parent 3d971b5b9217cad1e7a91cee39f5d49d0d383440 fix fireplace mappings diff -r 3d971b5b9217 -r 1b974520d9d7 .hgsub --- a/.hgsub Tue Jul 02 16:12:54 2013 -0700 +++ b/.hgsub Tue Jul 02 16:47:37 2013 -0700 @@ -17,6 +17,7 @@ vim/bundle/linediff = [git]git://github.com/AndrewRadev/linediff.vim.git vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git vim/bundle/nerdtree = [git]git://github.com/scrooloose/nerdtree.git +vim/bundle/paredit = [hg]https://bitbucket.org/kovisoft/paredit/ vim/bundle/powerline = [git]git://github.com/Lokaltog/vim-powerline.git vim/bundle/python-mode = [git]git://github.com/klen/python-mode.git vim/bundle/rainbow-parentheses = [git]git://github.com/kien/rainbow_parentheses.vim.git diff -r 3d971b5b9217 -r 1b974520d9d7 .hgsubstate --- a/.hgsubstate Tue Jul 02 16:12:54 2013 -0700 +++ b/.hgsubstate Tue Jul 02 16:47:37 2013 -0700 @@ -17,6 +17,7 @@ 78646801aac4d3d85e7c4e9570deccfce81a50e7 vim/bundle/linediff dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree +b6b7d8b1982b67a0bba936c198041f6f3a2286a4 vim/bundle/paredit 2af074850fde676743f655775e3e151925751adf vim/bundle/powerline 1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses diff -r 3d971b5b9217 -r 1b974520d9d7 vim/vimrc --- a/vim/vimrc Tue Jul 02 16:12:54 2013 -0700 +++ b/vim/vimrc Tue Jul 02 16:47:37 2013 -0700 @@ -613,45 +613,14 @@ " }}} " Clojure {{{ -" function! SlimvToggleRepl() -" if bufname('%') ==# 'SLIMV.REPL' -" let origin = b:pop_back_to -" q -" execute "" . origin . "wincmd w" -" else -" let origin = winnr() -" vertical botright split -" e SLIMV.REPL -" let b:pop_back_to = origin -" endif -" endfunction - -function! s:DebullshitClojureStacktrace() " {{{ - syntax match GarbageFrame '\v +.+\.(java|clj):\d+ (clojure|swank)\..+$' - hi link GarbageFrame Comment -endfunction " }}} - -command! -nargs=0 DebullshitClojureStacktrace call s:DebullshitClojureStacktrace() - augroup ft_clojure au! - au FileType SLDB DebullshitClojureStacktrace - au BufNewFile,BufRead riemann.config set filetype=clojure au FileType clojure silent! call TurnOnClojureFolding() au FileType clojure compiler clojure au FileType clojure setlocal report=100000 - - au BufWinEnter SLIMV.REPL setlocal nolist - au BufNewFile,BufReadPost SLIMV.REPL setlocal nowrap foldlevel=99 - au BufNewFile,BufReadPost SLIMV.REPL nnoremap A GA - au BufNewFile,BufReadPost SLIMV.REPL nnoremap R :emenu REPL. - - " Fix the eval mappings. - au FileType clojure nnoremap ef :call SlimvEvalExp() - au FileType clojure nnoremap ee :call SlimvEvalDefun() - au FileType clojure nnoremap en mzgg:call SlimvEvalDefun()`z + au FileType clojure RainbowParenthesesToggle " Friendlier Paredit mappings. au FileType clojure noremap () :call PareditWrap("(", ")") @@ -662,15 +631,11 @@ au FileType clojure noremap (s :call PareditSplit() au FileType clojure noremap [ :call PareditSmartJumpOpening(0) au FileType clojure noremap ] :call PareditSmartJumpClosing(0) - - " And the inspect mapping. - au FileType clojure nmap \i \di - - " And REPL-toggling mapping. - " au FileType clojure nnoremap \rr :call SlimvToggleRepl() + " ))) " Indent top-level form. au FileType clojure nmap = mz99[(v%='z + " ]) augroup END " }}} @@ -1302,23 +1267,6 @@ nnoremap :ScratchToggle " }}} -" 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:slimv_preferred = 'clisp' -let g:paredit_smartjump = 1 - -" 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 ritz 4005' -" let g:slimv_swank_clojure = '! xterm -e lein ritz 4005 &' -let g:slimv_swank_clojure = '!false' - -" }}}} " Sparkup {{{ let g:sparkupNextMapping = '' @@ -1379,13 +1327,6 @@ let g:tslime_vars_mapping = 'T' " }}} -" VimClojure {{{ - -let vimclojure#HighlightBuiltins = 1 -let vimclojure#ParenRainbow = 1 -let vimclojure#WantNailgun = 0 - -" }}} " YankRing {{{ function! YRRunAfterMaps()