# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1335188987 -3600
# Node ID 7c774a90f3514b65c945bc8ab83ae5a716c21f83
# Parent  2c088480ba9e9e9d478ec56a39026af836e421a1
moar

diff -r 2c088480ba9e -r 7c774a90f351 .hgsub
--- a/.hgsub	Fri Apr 20 14:00:31 2012 +0100
+++ b/.hgsub	Mon Apr 23 14:49:47 2012 +0100
@@ -19,7 +19,7 @@
 vim/bundle/vim-orgmode = [git]git://github.com/jceb/vim-orgmode.git
 vim/bundle/python-mode = [git]git://github.com/klen/python-mode.git
 vim/bundle/slimv = [hg]https://bitbucket.org/sjl/slimv
-vim/bundle/threesome = [hg]https://bitbucket.org/sjl/threesome.vim
+vim/bundle/splice = [hg]https://bitbucket.org/sjl/splice.vim
 vim/bundle/vitality = [hg]https://bitbucket.org/sjl/vitality.vim
 vim/bundle/vim-makegreen = [git]git://github.com/sjl/vim-makegreen.git
 vim/bundle/supertab = [git]git://github.com/ervandew/supertab.git
diff -r 2c088480ba9e -r 7c774a90f351 .hgsubstate
--- a/.hgsubstate	Fri Apr 20 14:00:31 2012 +0100
+++ b/.hgsubstate	Mon Apr 23 14:49:47 2012 +0100
@@ -8,7 +8,7 @@
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
 4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive
-ab9d330375e42d05b63fc87b30797b84828dbe24 vim/bundle/gundo
+43ea418b11f7f78aae0e60229548f68400fc89b8 vim/bundle/gundo
 9b71f09cb0665560ef23b0c5a7d158b572fb8118 vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
 9543eec44e5cb75b67f0e5eaf1377ca82ced7b90 vim/bundle/linediff
@@ -20,11 +20,11 @@
 17bd7f6cefeec93af6c852b3c146c8e75805cc4b vim/bundle/slimv
 c01d81a697de5e28452f32762a9c8fbe3eac0496 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
+3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 5a38ce8b600e11941f695523363fe04e6478549a vim/bundle/supertab
 489a1e8c676ad47dd358dbf883bfaf492148d38b vim/bundle/surround
 b4e85a87629c3db9900fed82f507c43d634fe7c0 vim/bundle/syntastic
-c3f318a26db29fcbb65da43dc31d214be3b3b242 vim/bundle/threesome
 2dee007ddae8156735cbae7f0cd4e0a24ba7287b vim/bundle/tslime
 50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/vim-commentary
 a8ce721701fdd015695406f7df315f48bb447ebb vim/bundle/vim-javascript
diff -r 2c088480ba9e -r 7c774a90f351 gitconfig
--- a/gitconfig	Fri Apr 20 14:00:31 2012 +0100
+++ b/gitconfig	Mon Apr 23 14:49:47 2012 +0100
@@ -62,10 +62,10 @@
     tool = Kaleidoscope
 
 [merge]
-    tool = threesome
+    tool = splice
 
-[mergetool "threesome"]
-    cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+[mergetool "splice"]
+    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
     trustExitCode = true
 [web]
     browser = open
diff -r 2c088480ba9e -r 7c774a90f351 hgrc
--- a/hgrc	Fri Apr 20 14:00:31 2012 +0100
+++ b/hgrc	Mon Apr 23 14:49:47 2012 +0100
@@ -58,10 +58,10 @@
 opts.dd = 
 
 [merge-tools]
-threesome.executable = mvim
-threesome.args = -f $base $local $other $output -c 'ThreesomeInit'
-threesome.premerge = keep
-threesome.priority = 1
+splice.executable = vim
+splice.args = -f $base $local $other $output -c 'SpliceInit'
+splice.premerge = keep
+splice.priority = 1
 
 keepthat.executable = sh
 keepthat.args = -c 'cp "$local" "$output.original" && cp "$other" "$output"'
diff -r 2c088480ba9e -r 7c774a90f351 vim/vimrc
--- a/vim/vimrc	Fri Apr 20 14:00:31 2012 +0100
+++ b/vim/vimrc	Mon Apr 23 14:49:47 2012 +0100
@@ -266,9 +266,12 @@
 " Make backspace work sanely in visual mode
 vnoremap <bs> x
 
+" Insert the directory of the current buffer in command line mode
+cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'
+
 " Select entire buffer
-vnoremap vaa ggvGg_
-vnoremap Vaa ggVG
+nnoremap vaa ggvGg_
+nnoremap Vaa ggVG
 
 " Change case
 inoremap <C-u> <esc>gUiwea
@@ -1175,28 +1178,28 @@
 let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf'
 
 " }}}
-" Threesome {{{
+" Splice {{{
 
-let g:threesome_leader = "-"
+" let g:splice_leader = "-"
 
-let g:threesome_initial_mode = "grid"
+let g:splice_initial_mode = "grid"
 
-let g:threesome_initial_layout_grid = 1
-let g:threesome_initial_layout_loupe = 0
-let g:threesome_initial_layout_compare = 0
-let g:threesome_initial_layout_path = 0
+let g:splice_initial_layout_grid = 0
+let g:splice_initial_layout_loupe = 0
+let g:splice_initial_layout_compare = 0
+let g:splice_initial_layout_path = 0
 
-let g:threesome_initial_diff_grid = 1
-let g:threesome_initial_diff_loupe = 0
-let g:threesome_initial_diff_compare = 0
-let g:threesome_initial_diff_path = 0
+let g:splice_initial_diff_grid = 1
+let g:splice_initial_diff_loupe = 0
+let g:splice_initial_diff_compare = 1
+let g:splice_initial_diff_path = 0
 
-let g:threesome_initial_scrollbind_grid = 0
-let g:threesome_initial_scrollbind_loupe = 0
-let g:threesome_initial_scrollbind_compare = 0
-let g:threesome_initial_scrollbind_path = 0
+let g:splice_initial_scrollbind_grid = 0
+let g:splice_initial_scrollbind_loupe = 0
+let g:splice_initial_scrollbind_compare = 0
+let g:splice_initial_scrollbind_path = 0
 
-let g:threesome_wrap = "nowrap"
+let g:splice_wrap = "nowrap"
 
 " }}}
 " tslime {{{