# HG changeset patch # User Steve Losh # Date 1393783847 18000 # Node ID b1afc54323442b7c3c4f51c461dd9d40b77633d9 # Parent f23410884efd82fb57e43bb1a459a070ecb0f321 moooroe diff -r f23410884efd -r b1afc5432344 vim/after/plugin/fireplace-map-unfucking.vim --- a/vim/after/plugin/fireplace-map-unfucking.vim Sun Mar 02 13:09:46 2014 -0500 +++ b/vim/after/plugin/fireplace-map-unfucking.vim Sun Mar 02 13:10:47 2014 -0500 @@ -50,13 +50,13 @@ " au Filetype clojure nmap s FireplaceSource " Eval Buffer - au Filetype clojure nnoremap eb :%Eval + au Filetype clojure nnoremap b :%Eval " Eval Form - au Filetype clojure nmap ef FireplacePrintab + au Filetype clojure nmap f FireplacePrintab " Eval Top-Level Form - au Filetype clojure nmap ee mz$:call PareditFindDefunBck()FireplacePrintab'z + au Filetype clojure nmap e mz$:call PareditFindDefunBck()FireplacePrintab'z " Open clojure command line editor client window thing au Filetype clojure exe 'nmap E FireplacePrompt' . &cedit . 'i' diff -r f23410884efd -r b1afc5432344 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Sun Mar 02 13:09:46 2014 -0500 +++ b/vim/custom-dictionary.utf-8.add Sun Mar 02 13:10:47 2014 -0500 @@ -158,3 +158,4 @@ Postgres GPG TLS +Reykjavík diff -r f23410884efd -r b1afc5432344 vim/vimrc --- a/vim/vimrc Sun Mar 02 13:09:46 2014 -0500 +++ b/vim/vimrc Sun Mar 02 13:10:47 2014 -0500 @@ -709,12 +709,24 @@ \ \ 'defproject', \ + \ 'defquery', + \ 'defqueries', + \ + \ 'deferror', + \ \ 'defroutes' \ ] +let g:clojure_highlight_extra_exceptions = [ + \ 'try+', + \ 'throw+', + \ ] + augroup ft_clojure au! + au BufNewFile,BufRead *.edn set filetype=clojure + au BufNewFile,BufRead riemann.config set filetype=clojure au FileType clojure silent! call TurnOnClojureFolding() au FileType clojure compiler clojure @@ -1120,6 +1132,7 @@ " Send to tmux with localleader e au FileType pgsql nnoremap e :let psql_tslime_view = winsaveview()vip"ry:call SendToTmux(@r):call winrestview(psql_tslime_view) + augroup END " }}} @@ -1347,6 +1360,11 @@ let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_ffind_command] " }}} +" DelimitMate {{{ + +let delimitMate_excluded_ft = "clojure,lisp" + +" }}} " Dispatch {{{ nnoremap d :Dispatch @@ -1465,6 +1483,7 @@ let g:paredit_smartjump = 1 let g:paredit_shortmaps = 0 +let g:paredit_electric_return = 1 " }}} " Powerline {{{ @@ -2022,7 +2041,7 @@ diffupdate endfunction " }}} command! -nargs=0 HgDiff call s:HgDiff() -" nnoremap hd :HgDiff +nnoremap Hd :HgDiff function! s:HgBlame() " {{{ let fn = expand('%:p') @@ -2044,7 +2063,7 @@ syncbind endfunction " }}} command! -nargs=0 HgBlame call s:HgBlame() -" nnoremap hb :HgBlame +nnoremap Hb :HgBlame " }}} " Ack motions {{{