# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1394046640 18000
# Node ID 021398e3fd15394e194f62ae3e0c68555bb7da18
# Parent  efcd701f7122572663342df5a4c1f0a670c85b68# Parent  5311f9e651b77fe59264b89880b339b8ee3b744c
Merge.

diff -r efcd701f7122 -r 021398e3fd15 .hgsub
--- a/.hgsub	Wed Mar 05 14:09:27 2014 -0500
+++ b/.hgsub	Wed Mar 05 14:10:40 2014 -0500
@@ -10,6 +10,7 @@
 vim/bundle/clojure-static        = [git]git://github.com/sjl/vim-clojure-static.git
 vim/bundle/commentary            = [git]git://github.com/tpope/vim-commentary.git
 vim/bundle/ctrlp                 = [git]git://github.com/kien/ctrlp.vim.git
+vim/bundle/delimitmate           = [git]git://github.com/Raimondi/delimitMate.git
 vim/bundle/dispatch              = [git]git://github.com/tpope/vim-dispatch.git
 vim/bundle/fireplace             = [git]git://github.com/tpope/vim-fireplace.git
 vim/bundle/fugitive              = [git]git://github.com/tpope/vim-fugitive.git
@@ -33,7 +34,6 @@
 vim/bundle/scala                 = [git]git://github.com/sjl/vim-scala.git
 vim/bundle/scaladoc              = [git]git://github.com/sjl/vim-scaladoc.git
 vim/bundle/securemodelines       = [git]git://github.com/ciaranm/securemodelines.git
-vim/bundle/smartinput            = [git]git://github.com/kana/vim-smartinput.git
 vim/bundle/sparkup               = [git]git://github.com/tristen/vim-sparkup.git
 vim/bundle/splice                = [hg]https://bitbucket.org/sjl/splice.vim
 vim/bundle/strftimedammit        = [hg]https://bitbucket.org/sjl/strftimedammit.vim/
@@ -42,4 +42,3 @@
 vim/bundle/tslime                = [git]git://github.com/sjl/tslime.vim.git
 vim/bundle/vitality              = [hg]https://bitbucket.org/sjl/vitality.vim
 vim/bundle/yankring              = [git]git://github.com/vim-scripts/YankRing.vim.git
-vim/bundle/you-complete-me       = [git]git://github.com/Valloric/YouCompleteMe.git
diff -r efcd701f7122 -r 021398e3fd15 .hgsubstate
--- a/.hgsubstate	Wed Mar 05 14:09:27 2014 -0500
+++ b/.hgsubstate	Wed Mar 05 14:10:40 2014 -0500
@@ -10,6 +10,7 @@
 5201a3860dbc32814f44eaf9386245caa70a65e6 vim/bundle/clojure-static
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp
+38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
 ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
 3a843cb1b183bd853b843fbaef89af27b726ac25 vim/bundle/fireplace
 34e2d2538a634a0a820a56994333ffa1fec1bc58 vim/bundle/fugitive
@@ -33,7 +34,6 @@
 cfc1a90540f648492086a20e39fde7514c469fa7 vim/bundle/scala
 1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
 10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
-78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 0377b100382c19295b42018289fe8d42a7d57e80 vim/bundle/sparkup
 8e1c1dc358de2132b7fbc1adaf94f528e3238e4d vim/bundle/splice
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
@@ -42,4 +42,3 @@
 113b1f14a1fb92b9c026a71485c9ed402a2045f8 vim/bundle/tslime
 84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
-18be5c254a48590b81dfc492ed15f36f11be8cd9 vim/bundle/you-complete-me
diff -r efcd701f7122 -r 021398e3fd15 vim/after/plugin/fireplace-map-unfucking.vim
--- a/vim/after/plugin/fireplace-map-unfucking.vim	Wed Mar 05 14:09:27 2014 -0500
+++ b/vim/after/plugin/fireplace-map-unfucking.vim	Wed Mar 05 14:10:40 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'
diff -r efcd701f7122 -r 021398e3fd15 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Mar 05 14:09:27 2014 -0500
+++ b/vim/custom-dictionary.utf-8.add	Wed Mar 05 14:10:40 2014 -0500
@@ -158,3 +158,4 @@
 Postgres
 GPG
 TLS
+Reykjavík
diff -r efcd701f7122 -r 021398e3fd15 vim/vimrc
--- a/vim/vimrc	Wed Mar 05 14:09:27 2014 -0500
+++ b/vim/vimrc	Wed Mar 05 14:10:40 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
 
     " kill pager with q
@@ -1350,6 +1363,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>
@@ -1468,6 +1486,7 @@
 
 let g:paredit_smartjump = 1
 let g:paredit_shortmaps = 0
+let g:paredit_electric_return = 1
 
 " }}}
 " Powerline {{{
@@ -1621,24 +1640,6 @@
 endfunction
 
 " }}}
-" YouCompleteMe {{{
-
-let g:ycm_min_num_of_chars_for_completion = 4
-" let g:ycm_collect_identifiers_from_tags_files = 1
-let g:ycm_seed_identifiers_with_syntax = 1
-let g:ycm_filetype_blacklist = {
-      \ 'tagbar' : 1,
-      \ 'qf' : 1,
-      \ 'notes' : 1,
-      \ 'markdown' : 1,
-      \ 'unite' : 1,
-      \ 'text' : 1,
-      \ 'vimwiki' : 1,
-      \ 'pandoc' : 1,
-      \ 'clojure' : 1,
-      \}
-
-" }}}
 
 " }}}
 " Text objects ------------------------------------------------------------ {{{
@@ -2025,7 +2026,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')
@@ -2047,7 +2048,7 @@
     syncbind
 endfunction " }}}
 command! -nargs=0 HgBlame call s:HgBlame()
-" nnoremap <leader>hb :HgBlame<cr>
+nnoremap <leader>Hb :HgBlame<cr>
 
 " }}}
 " Ack motions {{{