# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1309360066 14400
# Node ID b221ba644703b70223ad883b00effcdd9fd2973b
# Parent  bb7220ad4109e2a9e89b08f6e6079942678a467f
Lots.

diff -r bb7220ad4109 -r b221ba644703 .hgsubstate
--- a/.hgsubstate	Mon Jun 27 14:25:52 2011 -0400
+++ b/.hgsubstate	Wed Jun 29 11:07:46 2011 -0400
@@ -2,7 +2,7 @@
 b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
 bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t
 24c9f6c5974d1838a2e1db8c58bf4160298433a2 vim/bundle/easymotion
-0a6df52ad402a3ea63c06bb46ff5fa2c861fbed7 vim/bundle/gundo
+62a07cb58cffdd669ea2ca5885be33e76bb694e7 vim/bundle/gundo
 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter
@@ -14,7 +14,7 @@
 27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
 60731769663ea23b4763f3f0034da445ebcd3ddd vim/bundle/syntastic
 8e2dfdcc6e13d8afab5b3f620ee06ebb29b786f9 vim/bundle/tasklist
-4995b244e11d5aaa9956bba061c32140e6af8705 vim/bundle/threesome
+9b4db1bd103ac74cafb005d1e185725b1c09af1b vim/bundle/threesome
 b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
 c2df2e430d7d5fe645aa40e36079ab51f082e06b vim/bundle/vim-javascript
 f21fbd8759d7fa6c3cb1bbb9fe05eae90422f01a vim/bundle/vim-makegreen
diff -r bb7220ad4109 -r b221ba644703 vim/.vimrc
--- a/vim/.vimrc	Mon Jun 27 14:25:52 2011 -0400
+++ b/vim/.vimrc	Wed Jun 29 11:07:46 2011 -0400
@@ -45,6 +45,7 @@
 set showbreak=↪
 set splitbelow
 set splitright
+set fillchars=diff:\ 
 
 " Save when losing focus
 au FocusLost * :wa
@@ -361,18 +362,6 @@
 au BufNewFile,BufRead *.html inoremap <buffer> <s-cr> <cr><esc>kA<cr>
 au BufNewFile,BufRead *.html nnoremap <buffer> <s-cr> vit<esc>a<cr><esc>vito<esc>i<cr><esc>
 
-" Sparkup mappings:
-"
-" <c-e><space> to expand sparkup normally:
-"     <p>|</p>
-"
-" <c-e><return> to force an expanded sparkup.
-"     <p>
-"         |
-"     </p>
-au BufNewFile,BufRead *.html imap <buffer> <c-s><cr> <c-s><s-cr>
-au BufNewFile,BufRead *.html imap <buffer> <c-s><space> <c-s>.<bs>
-
 " Django tags
 au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
 
@@ -421,9 +410,9 @@
 " }}}
 " Python {{{
 
-au Filetype python noremap  <localleader>rr :RopeRename<CR>
-au Filetype python vnoremap <localleader>rm :RopeExtractMethod<CR>
-au Filetype python noremap  <localleader>ri :RopeOrganizeImports<CR>
+au Filetype python noremap  <localleader>Rr :RopeRename<CR>
+au Filetype python vnoremap <localleader>Rm :RopeExtractMethod<CR>
+au Filetype python noremap  <localleader>Ri :RopeOrganizeImports<CR>
 au FileType python setlocal omnifunc=pythoncomplete#Complete
 
 " }}}
@@ -467,6 +456,9 @@
 nnoremap <C-u> gUiw
 inoremap <C-u> <esc>gUiwea
 
+" Diffoff
+nnoremap <leader>D :diffoff!<cr>
+
 " Yankring
 nnoremap <silent> <F6> :YRShow<cr>
 
@@ -600,8 +592,7 @@
 " }}}
 " Sparkup {{{
 
-let g:sparkupExecuteMapping = '<c-s>'
-let g:sparkupNextMapping = '<c-q>'
+let g:sparkupNextMapping = '<c-s>'
 
 "}}}
 " Autoclose {{{
@@ -622,8 +613,8 @@
 " }}}
 " Pydoc {{{
 
-au FileType python noremap <buffer> <localleader>lw :call ShowPyDoc('<C-R><C-W>', 1)<CR>
-au FileType python noremap <buffer> <localleader>lW :call ShowPyDoc('<C-R><C-A>', 1)<CR>
+au FileType python noremap <buffer> <localleader>Lw :call ShowPyDoc('<C-R><C-W>', 1)<CR>
+au FileType python noremap <buffer> <localleader>LW :call ShowPyDoc('<C-R><C-A>', 1)<CR>
 
 " }}}
 " Scratch {{{
@@ -647,12 +638,6 @@
 let g:org_todo_keywords = ['TODO', '|', 'DONE']
 let g:org_debug = 1
 " }}}
-" DirDiff {{{
-map <unique> <Leader>Dg <Plug>DirDiffGet
-map <unique> <Leader>Dp <Plug>DirDiffPut
-map <unique> <Leader>Dj <Plug>DirDiffNext
-map <unique> <Leader>Dk <Plug>DirDiffPrev
-" }}}
 " SLIMV {{{
 
 " First check if SWANK is bundled with Slimv
@@ -876,6 +861,26 @@
 endf
 
 " }}}
+" Hg Diff --------------------------------------------------------------------- {{{
+
+function! s:HgDiff()
+    diffthis
+    let fn = expand('%:p')
+    let ft = &ft
+    wincmd v
+    edit __hgdiff_orig__
+    setlocal buftype=nofile
+    normal ggdG
+    execute "silent r!hg cat --rev . " . fn
+    normal ggdd
+    execute "setlocal ft=" . ft
+    diffthis
+    diffupdate
+endf
+command! -nargs=0 HgDiff call s:HgDiff()
+nnoremap <leader>hd :HgDiff<cr>
+
+" }}}
 " Open quoted ----------------------------------------------------------------- {{{
 
 nnoremap <silent> ø :OpenQuoted<cr>
@@ -921,7 +926,7 @@
     highlight SpellBad term=underline gui=undercurl guisp=Orange
 
     " Use a line-drawing char for pretty vertical splits.
-    set fillchars=vert:│
+    set fillchars+=vert:│
 
     " Different cursors for different modes.
     set guicursor=n-c:block-Cursor-blinkon0
diff -r bb7220ad4109 -r b221ba644703 vim/ftplugin/python/folding.vim
--- a/vim/ftplugin/python/folding.vim	Mon Jun 27 14:25:52 2011 -0400
+++ b/vim/ftplugin/python/folding.vim	Wed Jun 29 11:07:46 2011 -0400
@@ -47,8 +47,8 @@
 setlocal foldmethod=expr
 setlocal foldexpr=GetPythonFold(v:lnum)
 setlocal foldtext=PythonFoldText()
-nnoremap <buffer> <localleader>D :setlocal foldtext=PythonFoldTextDocstrings()<cr>
-nnoremap <buffer> <localleader>d :setlocal foldtext=PythonFoldText()<cr>
+"nnoremap <buffer> <localleader>D :setlocal foldtext=PythonFoldTextDocstrings()<cr>
+"nnoremap <buffer> <localleader>d :setlocal foldtext=PythonFoldText()<cr>
 
 function! PythonFoldText()
     " ignore decorators