b1afc5432344

--- 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 <buffer> <localleader>s <Plug>FireplaceSource
 
     " Eval Buffer
-    au Filetype clojure nnoremap <buffer> <localleader>eb :%Eval<cr>
+    au Filetype clojure nnoremap <buffer> <localleader>b :%Eval<cr>
 
     " Eval Form
-    au Filetype clojure nmap <buffer> <localleader>ef <Plug>FireplacePrintab
+    au Filetype clojure nmap <buffer> <localleader>f <Plug>FireplacePrintab
 
     " Eval Top-Level Form
-    au Filetype clojure nmap <buffer> <localleader>ee mz$:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
+    au Filetype clojure nmap <buffer> <localleader>e mz$:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
 
     " Open clojure command line editor client window thing
     au Filetype clojure exe 'nmap <buffer> <localleader>E <Plug>FireplacePrompt' . &cedit . 'i'

--- 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

--- 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 <buffer> <silent> <localleader>e :let psql_tslime_view = winsaveview()<cr>vip"ry:call SendToTmux(@r)<cr>:call winrestview(psql_tslime_view)<cr>
+
 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 <leader>d :Dispatch<cr>
@@ -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 <leader>hd :HgDiff<cr>
+nnoremap <leader>Hd :HgDiff<cr>
 
 function! s:HgBlame() " {{{
     let fn = expand('%:p')
@@ -2044,7 +2063,7 @@
     syncbind
 endfunction " }}}
 command! -nargs=0 HgBlame call s:HgBlame()
-" nnoremap <leader>hb :HgBlame<cr>
+nnoremap <leader>Hb :HgBlame<cr>
 
 " }}}
 " Ack motions {{{