# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1386176875 18000
# Node ID df54cb5699951c168a84d9bf9e5a60a4669a0186
# Parent  6a9528799caa0bba09c021af806494565e4e1a8a# Parent  2de1f78616fd1ecafa0b93fab9f03708d9dee39f
Merge.

diff -r 2de1f78616fd -r df54cb569995 .hgsubstate
--- a/.hgsubstate	Sat Nov 09 12:58:55 2013 -0500
+++ b/.hgsubstate	Wed Dec 04 12:07:55 2013 -0500
@@ -34,7 +34,7 @@
 10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
-01e68795c7a14b97ec2ebbd70b0fcb42d1adac61 vim/bundle/splice
+8e1c1dc358de2132b7fbc1adaf94f528e3238e4d vim/bundle/splice
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
 14cb306414dda411b1809a088e18eb2796030095 vim/bundle/syntastic
diff -r 2de1f78616fd -r df54cb569995 ctags
--- a/ctags	Sat Nov 09 12:58:55 2013 -0500
+++ b/ctags	Wed Dec 04 12:07:55 2013 -0500
@@ -2,12 +2,14 @@
 --javascript-kinds=cm
 --fields=-s
 --fields=+l
+--fields=+n
 
 --languages=-html
 --languages=-javascript
 
 --exclude=flowplayer
 --exclude=.hg
+--exclude=.git
 --exclude=.ropeproject
 --exclude=libs
 --exclude=build
@@ -31,3 +33,17 @@
 --regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*val[ \t]+([a-zA-Z0-9_]+)/\3/l,constants/
 --regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*var[ \t]+([a-zA-Z0-9_]+)/\3/l,variables/
 --regex-scala=/^[ \t]*package[ \t]+([a-zA-Z0-9_.]+)/\1/p,packages/ 
+
+--langdef=Clojure
+--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]*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/
+--regex-clojure=/\([ \t]*defmethod[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/b,multimethod instance/
+--regex-clojure=/\([ \t]*defonce[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/c,definition (once)/
+--regex-clojure=/\([ \t]*defstruct[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/s,struct/
+--regex-clojure=/\([ \t]*intern[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/v,intern/
+--regex-clojure=/\([ \t]*ns[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/n,namespace/
diff -r 2de1f78616fd -r df54cb569995 dotcss/bank.simple.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/bank.simple.com.css	Wed Dec 04 12:07:55 2013 -0500
@@ -0,0 +1,3 @@
+#payment-goals-message { display: none !important; }
+span.trade { display: none !important; }
+#sts-flag { background: #EBA000 !important; text-shadow: 0px 2px 0px black;}
diff -r 2de1f78616fd -r df54cb569995 dotcss/simple.com.css
--- a/dotcss/simple.com.css	Sat Nov 09 12:58:55 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#payment-goals-message { display: none !important; }
diff -r 2de1f78616fd -r df54cb569995 gitconfig
--- a/gitconfig	Sat Nov 09 12:58:55 2013 -0500
+++ b/gitconfig	Wed Dec 04 12:07:55 2013 -0500
@@ -53,8 +53,8 @@
     unshel = unshelve
 
     delete-local-branch = branch -D
-    delete-remote-branch = push origin --delete
-    delete-local-reference-to-remote-branch = branch -rd
+    delete-local-reference-to-remote-branch = "!sh -c 'git branch -rd $1/$2' -"
+    delete-remote-branch = "!sh -c 'git push $1 --delete $2' -"
     delete-branch = "!sh -c 'git delete-local-branch $1; git delete-local-reference-to-remote-branch origin/$1; git delete-local-reference-to-remote-branch upstream/$1' -"
 
     currentbranch = rev-parse --abbrev-ref HEAD
diff -r 2de1f78616fd -r df54cb569995 vim/vimrc
--- a/vim/vimrc	Sat Nov 09 12:58:55 2013 -0500
+++ b/vim/vimrc	Wed Dec 04 12:07:55 2013 -0500
@@ -498,8 +498,19 @@
 " screen.  Both will pulse the cursor line so you can see where the hell you
 " are.  <c-\> will also fold everything in the buffer and then unfold just
 " enough for you to see the destination line.
-nnoremap <c-]> <c-]>mzzvzz15<c-e>`z:Pulse<cr>
-nnoremap <c-\> <c-w>v<c-]>mzzMzvzz15<c-e>`z:Pulse<cr>
+function! JumpToTag()
+    execute "normal! \<c-]>mzzvzz15\<c-e>"
+    execute "keepjumps normal! `z"
+    Pulse
+endfunction
+function! JumpToTagInSplit()
+    execute "normal! \<c-w>v\<c-]>mzzMzvzz15\<c-e>"
+    execute "keepjumps normal! `z"
+    Pulse
+endfunction
+nnoremap <c-]> :silent! call JumpToTag()<cr>
+nnoremap <c-\> :silent! call JumpToTagInSplit()<cr>
+" nnoremap <c-\> <c-w>v<c-]>mzzMzvzz15<c-e>`z:Pulse<cr>
 
 " Keep search matches in the middle of the window.
 nnoremap n nzzzv
@@ -580,9 +591,8 @@
 nnoremap <Space> za
 vnoremap <Space> za
 
-" Make zO recursively open whatever top level fold we're in, no matter where the
-" cursor happens to be.
-nnoremap zO zCzO
+" Make zO recursively open whatever fold we're in, even if it's partially open.
+nnoremap zO zczO
 
 " "Focus" the current line.  Basically:
 "
@@ -1422,7 +1432,9 @@
 " Syntastic {{{
 
 let g:syntastic_enable_signs = 1
-let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_open = 0
+let g:syntastic_check_on_wq = 0
+let g:syntastic_auto_jump = 0
 let g:syntastic_java_checker = 'javac'
 let g:syntastic_mode_map = {
             \ "mode": "active",
@@ -1987,18 +1999,13 @@
 " Pulse Line {{{
 
 function! s:Pulse() " {{{
-    let current_window = winnr()
-    windo set nocursorline
-    execute current_window . 'wincmd w'
-    setlocal cursorline
-
     redir => old_hi
         silent execute 'hi CursorLine'
     redir END
     let old_hi = split(old_hi, '\n')[0]
     let old_hi = substitute(old_hi, 'xxx', '', '')
 
-    let steps = 9
+    let steps = 8
     let width = 1
     let start = width
     let end = steps * width