From c3fecd6f87df61b2c8cfd5c47e716548d7fba10c Mon Sep 17 00:00:00 2001
From: Steve Losh <steve@stevelosh.com>
Date: Mon, 10 Sep 2012 10:38:19 -0400
Subject: [PATCH] Moar

---
 gitconfig                      |   4 ++++
 moom/com.manytricks.Moom.plist | Bin 5992 -> 5992 bytes
 vim/vimrc                      |  11 ++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gitconfig b/gitconfig
index c506e8f..188b64d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -43,6 +43,10 @@
     unstage = reset HEAD
     uns = reset HEAD
 
+    delete-local-branch = branch -D
+    delete-remote-branch = push origin --delete
+    delete-local-reference-to-remote-branch = branch -rd
+
     currentbranch = !git branch --contains HEAD | grep '*' | tr -s ' ' | cut -d ' ' -f2
 
     fo = fetch origin
diff --git a/moom/com.manytricks.Moom.plist b/moom/com.manytricks.Moom.plist
index d5f41d8c2cfe9630346c2d6cbd353e38473961a9..9ef8da12f6623d38b26e1f3ec7b5bc2b3baea93d 100644
GIT binary patch
delta 32
ocmaE%_d;*O7bam}3D;m_J%a!aPGiTdfBla<`^dDJojFki0M8Z-82|tP

delta 32
ocmaE%_d;*O7bam>eZOF1J%a!aPGiTdU(?Q2y=C6a&YUO$0M4Ha+W-In

diff --git a/vim/vimrc b/vim/vimrc
index 47c818e..28f1646 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -245,9 +245,6 @@ vnoremap <c-z> <esc>zv`<ztgv
 " Unfuck my screen
 nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
 
-" Don't clobber the yank register when pasting over text in visual mode.
-vnoremap p pgvy
-
 " Tabs
 nnoremap <leader>( :tabprev<cr>
 nnoremap <leader>) :tabnext<cr>
@@ -909,9 +906,7 @@ augroup END
 augroup ft_python
     au!
 
-    " au FileType python setlocal omnifunc=pythoncomplete#Complete
     au FileType python setlocal define=^\s*\\(def\\\\|class\\)
-    au FileType python compiler nose
     au FileType man nnoremap <buffer> <cr> :q<cr>
 
     " Jesus tapdancing Christ, built-in Python syntax, you couldn't let me
@@ -1311,9 +1306,15 @@ let vimclojure#WantNailgun = 0
 " YankRing {{{
 
 function! YRRunAfterMaps()
+    " Make Y yank to end of line.
     nnoremap Y :<C-U>YRYankCount 'y$'<CR>
+
+    " Fix L and H in operator-pending mode, so yH and such works.
     omap <expr> L YRMapsExpression("", "$")
     omap <expr> H YRMapsExpression("", "^")
+
+    " Don't clobber the yank register when pasting over text in visual mode.
+    vnoremap p :<c-u>YRPaste 'p', 'v'<cr>gv:YRYankRange 'v'<cr>
 endfunction
 
 " }}}