# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1392418305 18000
# Node ID 88e2c4dcdb52b1966f2b27b2470cdb08ddfa31b0
# Parent  98541843a878141869d188e88c4312ef98297009
More updates

diff -r 98541843a878 -r 88e2c4dcdb52 .hgsubstate
--- a/.hgsubstate	Tue Feb 11 11:24:05 2014 -0500
+++ b/.hgsubstate	Fri Feb 14 17:51:45 2014 -0500
@@ -2,7 +2,7 @@
 b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
-7cc399a017a0f20c230a50a4f05d58ab7ef9dca4 vim/bundle/YouCompleteMe
+18be5c254a48590b81dfc492ed15f36f11be8cd9 vim/bundle/YouCompleteMe
 d64ce06650cf9b098b5a01c0db53864965d9310b vim/bundle/abolish
 f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack
 6c4663589e73e21e77a9ea8403dcf2bf6cf9c11c vim/bundle/argumentative
@@ -12,7 +12,7 @@
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp
 ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
-b96ccf7441ada22d764af8223b61f18896d82dc9 vim/bundle/fireplace
+544769274a3e6cf8f0ff452d7e9c8feb224b268e vim/bundle/fireplace
 34e2d2538a634a0a820a56994333ffa1fec1bc58 vim/bundle/fugitive
 6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
diff -r 98541843a878 -r 88e2c4dcdb52 ctags
--- a/ctags	Tue Feb 11 11:24:05 2014 -0500
+++ b/ctags	Fri Feb 14 17:51:45 2014 -0500
@@ -38,7 +38,7 @@
 --langmap=Clojure:.clj
 --regex-clojure=/\([ \t]*create-ns[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/n,namespace/
 --regex-clojure=/\([ \t]*def[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/d,definition/
---regex-clojure=/\([ \t]*defn-?[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/f,function/
+--regex-clojure=/\([ \t]*defn-?[ \t]+(\^[-[:alnum:]*+!_:\/.?]+[ \t]+)?([-[:alnum:]*+!_:\/.?]+)/\2/f,function/
 --regex-clojure=/\([ \t]*defmacro[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/m,macro/
 --regex-clojure=/\([ \t]*definline[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/i,inline/
 --regex-clojure=/\([ \t]*defmulti[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/a,multimethod definition/
diff -r 98541843a878 -r 88e2c4dcdb52 gitconfig
--- a/gitconfig	Tue Feb 11 11:24:05 2014 -0500
+++ b/gitconfig	Fri Feb 14 17:51:45 2014 -0500
@@ -72,6 +72,8 @@
     uo = !git merge --ff-only origin/`git currentbranch`
     uu = !git merge --ff-only upstream/`git currentbranch`
 
+    fuu = "!sh -c 'git fu && git uu' -"
+
     addremove = !git add . && git add -u
     addrem = !git addremove
 
diff -r 98541843a878 -r 88e2c4dcdb52 vim/after/plugin/fireplace-map-unfucking.vim
--- a/vim/after/plugin/fireplace-map-unfucking.vim	Tue Feb 11 11:24:05 2014 -0500
+++ b/vim/after/plugin/fireplace-map-unfucking.vim	Fri Feb 14 17:51:45 2014 -0500
@@ -47,7 +47,7 @@
     au Filetype clojure nnoremap <buffer> <localleader>R :Require!<cr>
 
     " Get [S]ource
-    au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
+    " au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
 
     " Eval Buffer
     au Filetype clojure nnoremap <buffer> <localleader>eb :%Eval<cr>
@@ -60,4 +60,7 @@
 
     " Open clojure command line editor client window thing
     au Filetype clojure exe 'nmap <buffer> <localleader>E <Plug>FireplacePrompt' . &cedit . 'i'
+
+    " [S]how Last Result
+    au Filetype clojure nnoremap <buffer> <localleader>s :Last<cr>
 augroup END
diff -r 98541843a878 -r 88e2c4dcdb52 vim/vimrc
--- a/vim/vimrc	Tue Feb 11 11:24:05 2014 -0500
+++ b/vim/vimrc	Fri Feb 14 17:51:45 2014 -0500
@@ -717,6 +717,12 @@
     au syntax clojure RainbowParenthesesLoadSquare
     au syntax clojure RainbowParenthesesLoadBraces
 
+    " Since YCM is hosefucked for Clojure, we'll use omnicompletion on <c-n>
+    au FileType clojure inoremap <c-n> <c-x><c-o>
+
+    " And close the omnicomplete preview window after we're done with it.
+    au InsertLeave *.clj if pumvisible() == 0|pclose|endif
+
     " Friendlier Paredit mappings.
     au FileType clojure noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr>
     au FileType clojure noremap <buffer> )( :<c-u>call PareditSplice()<cr>
@@ -1136,6 +1142,16 @@
 augroup END
 
 " }}}
+" Standard In {{{
+
+augroup ft_stdin
+    au!
+
+    " Treat buffers from stdin (e.g.: echo foo | vim -) as scratch.
+    au StdinReadPost * :set buftype=nofile
+augroup END
+
+" }}}
 " stevelosh.com Blog Entries {{{
 
 augroup ft_steveloshcom
@@ -1542,6 +1558,19 @@
 " 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,
+      \}
 
 " }}}