# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1349449949 14400
# Node ID e484a4d62a7b09d8aea60614654ebfb925a1b955
# Parent  ccfb49aa1acace1867c19c30adb7e3163f3e73b2
Moar.

diff -r ccfb49aa1aca -r e484a4d62a7b .hgsub
--- a/.hgsub	Thu Oct 04 10:12:00 2012 -0400
+++ b/.hgsub	Fri Oct 05 11:12:29 2012 -0400
@@ -7,7 +7,6 @@
 vim/bundle/clam           = [hg]https://bitbucket.org/sjl/clam.vim/
 vim/bundle/commentary     = [git]git://github.com/tpope/vim-commentary.git
 vim/bundle/ctrlp          = [git]git://github.com/kien/ctrlp.vim.git
-vim/bundle/easymotion     = [git]git://github.com/Lokaltog/vim-easymotion.git
 vim/bundle/fugitive       = [git]git://github.com/tpope/vim-fugitive.git
 vim/bundle/gundo          = [hg]https://bitbucket.org/sjl/gundo.vim/
 vim/bundle/html5          = [git]git://github.com/othree/html5.vim.git
diff -r ccfb49aa1aca -r e484a4d62a7b .hgsubstate
--- a/.hgsubstate	Thu Oct 04 10:12:00 2012 -0400
+++ b/.hgsubstate	Fri Oct 05 11:12:29 2012 -0400
@@ -7,7 +7,6 @@
 ed67c4908fa033eef6cdfacc8141750e99f1345b vim/bundle/clam
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp
-667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
 cff78c3ab4605d490e6be8d8af02f1e7efd25c95 vim/bundle/fugitive
 8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo
 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
diff -r ccfb49aa1aca -r e484a4d62a7b gitconfig
--- a/gitconfig	Thu Oct 04 10:12:00 2012 -0400
+++ b/gitconfig	Fri Oct 05 11:12:29 2012 -0400
@@ -25,9 +25,10 @@
     pull = pull --ff-only
     up = merge --ff-only
 
-    merge = merge --no-ff
     join = merge --no-ff
 
+    discard-merge = reset --hard HEAD
+
     ci = commit
     cm = commit -m
 
diff -r ccfb49aa1aca -r e484a4d62a7b moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r ccfb49aa1aca -r e484a4d62a7b vim/vimrc
--- a/vim/vimrc	Thu Oct 04 10:12:00 2012 -0400
+++ b/vim/vimrc	Fri Oct 05 11:12:29 2012 -0400
@@ -162,11 +162,23 @@
 " }}}
 " Backups {{{
 
+set backup                        " enable backups
+set noswapfile                    " It's 2012, Vim.
+
 set undodir=~/.vim/tmp/undo//     " undo files
 set backupdir=~/.vim/tmp/backup// " backups
 set directory=~/.vim/tmp/swap//   " swap files
-set backup                        " enable backups
-set noswapfile                    " It's 2012, Vim.
+
+" Make those folders automatically if they don't already exist.
+if !isdirectory(expand(&undodir))
+    call mkdir(expand(&undodir), "p")
+endif
+if !isdirectory(expand(&backupdir))
+    call mkdir(expand(&backupdir), "p")
+endif
+if !isdirectory(expand(&directory))
+    call mkdir(expand(&directory), "p")
+endif
 
 " }}}
 " Leader {{{
@@ -466,12 +478,6 @@
 " something similar: move to last change
 nnoremap gI `.
 
-" Open a Quickfix window for the last search.
-nnoremap <silent> <leader>? :execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR>
-
-" Ack for the last search.
-nnoremap <silent> <leader>/ :execute "Ack! '" . substitute(substitute(substitute(@/, "\\\\<", "\\\\b", ""), "\\\\>", "\\\\b", ""), "\\\\v", "", "") . "'"<CR>
-
 " Fix linewise visual selection of various text objects
 nnoremap VV V
 nnoremap Vit vitVkoj
@@ -501,7 +507,6 @@
 " }}}
 " Highlight word {{{
 
-nnoremap <silent> <leader>hh :execute 'match InterestingWord1 /\<<c-r><c-w>\>/'<cr>
 nnoremap <silent> <leader>h1 :execute 'match InterestingWord1 /\<<c-r><c-w>\>/'<cr>
 nnoremap <silent> <leader>h2 :execute '2match InterestingWord2 /\<<c-r><c-w>\>/'<cr>
 nnoremap <silent> <leader>h3 :execute '3match InterestingWord3 /\<<c-r><c-w>\>/'<cr>
@@ -1053,22 +1058,6 @@
 nnoremap <leader>. :CtrlPTag<cr>
 
 " }}}
-" Easymotion {{{
-
-let g:EasyMotion_do_mapping = 0
-
-nnoremap <silent> <Leader>f      :call EasyMotion#F(0, 0)<CR>
-onoremap <silent> <Leader>f      :call EasyMotion#F(0, 0)<CR>
-vnoremap <silent> <Leader>f :<C-U>call EasyMotion#F(1, 0)<CR>
-
-nnoremap <silent> <Leader>F      :call EasyMotion#F(0, 1)<CR>
-onoremap <silent> <Leader>F      :call EasyMotion#F(0, 1)<CR>
-vnoremap <silent> <Leader>F :<C-U>call EasyMotion#F(1, 1)<CR>
-
-onoremap <silent> <Leader>t      :call EasyMotion#T(0, 0)<CR>
-onoremap <silent> <Leader>T      :call EasyMotion#T(0, 1)<CR>
-
-" }}}
 " Fugitive {{{
 
 nnoremap <leader>gd :Gdiff<cr>