# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1347287899 14400
# Node ID fe93cda838bc1bad227778aa7414a9c787d1f74e
# Parent  82049cfc9eb4aca387cbf35f131aa9ff1d5f852c
Moar

diff -r 82049cfc9eb4 -r fe93cda838bc gitconfig
--- a/gitconfig	Tue Sep 04 13:19:12 2012 -0400
+++ b/gitconfig	Mon Sep 10 10:38:19 2012 -0400
@@ -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 -r 82049cfc9eb4 -r fe93cda838bc moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r 82049cfc9eb4 -r fe93cda838bc vim/vimrc
--- a/vim/vimrc	Tue Sep 04 13:19:12 2012 -0400
+++ b/vim/vimrc	Mon Sep 10 10:38:19 2012 -0400
@@ -245,9 +245,6 @@
 " 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 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 @@
 " 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
 
 " }}}