# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1313765134 14400
# Node ID 8237628a8193d7a1bb2c01949b64209ed3bab932
# Parent  e50c19784e1e3890b5108ae963493996d10353b7# Parent  8a3d616d75444e555ada89e95d537221fe8cf576
Merge.

diff -r 8a3d616d7544 -r 8237628a8193 vim/.vimrc
--- a/vim/.vimrc	Thu Aug 18 20:59:50 2011 -0400
+++ b/vim/.vimrc	Fri Aug 19 10:45:34 2011 -0400
@@ -140,7 +140,6 @@
 runtime macros/matchit.vim
 map <tab> %
 
-nnoremap Y y$
 nnoremap D d$
 
 " Make horizontal scrolling less horrible.
@@ -276,9 +275,9 @@
 " Use a swank command that works, and doesn't require new app windows.
 au FileType clojure let g:slimv_swank_cmd='!dtach -n /tmp/dvtm-swank.sock -r winch lein swank'
 
-au BufNewFile,BufRead Slimv.REPL.clj setlocal winfixwidth
+au BufWinEnter Slimv.REPL.clj setlocal winfixwidth
 au BufNewFile,BufRead Slimv.REPL.clj setlocal nowrap
-au BufNewFile,BufRead Slimv.REPL.clj normal! zR
+au BufWinEnter Slimv.REPL.clj normal! zR
 
 " }}}
 " Confluence {{{
@@ -518,6 +517,18 @@
 nnoremap <leader>1 :set cmdheight=1<cr>
 nnoremap <leader>2 :set cmdheight=2<cr>
 
+" Paste intelligently by default, use option+p to paste raw.
+function! YRRunAfterMaps()
+    nnoremap Y :<C-U>YRYankCount 'y$'<CR>
+    nnoremap p :<C-U>YRPaste 'p'<CR>v`]=`]
+    nnoremap P :<C-U>YRPaste 'P'<CR>v`]=`]
+    nnoremap π :<C-U>YRPaste 'p'<CR>
+    nnoremap ∏ :<C-U>YRPaste 'P'<CR>
+endfunction
+
+" Replaste
+nnoremap <D-p> "_ddPV`]=
+
 " Marks and Quotes
 noremap ' `
 noremap æ '
@@ -552,9 +563,6 @@
 " Toggle paste
 set pastetoggle=<F8>
 
-" Replaste
-nnoremap <D-p> "_ddPV`]
-
 " Split/Join
 " ----------
 "