# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1313591860 14400
# Node ID 00e4e08af4f5e1b8de3875ab468b6e5a99923890
# Parent  5bd004df024039c8202d5b7538e38a22bdd0e3e1
Update subrepository state.

diff -r 5bd004df0240 -r 00e4e08af4f5 .hgsub
--- a/.hgsub	Wed Aug 17 09:31:48 2011 -0400
+++ b/.hgsub	Wed Aug 17 10:37:40 2011 -0400
@@ -12,7 +12,7 @@
 vim/bundle/vim-javascript = [git]git://github.com/pangloss/vim-javascript.git
 vim/bundle/strftimedammit = [hg]http://bitbucket.org/sjl/strftimedammit.vim/
 vim/bundle/easymotion = [git]git://github.com/Lokaltog/vim-easymotion.git
-vim/bundle/pydoc = [git]git://github.com/fs111/pydoc.vim.git
+vim/bundle/pydoc = [git]git://github.com/sjl/pydoc.vim.git
 vim/bundle/command-t = [git]git://github.com/vim-scripts/Command-T.git
 vim/bundle/vim-orgmode = [git]git://github.com/sjl/vim-orgmode.git
 vim/bundle/slimv = [hg]http://bitbucket.org/sjl/slimv
diff -r 5bd004df0240 -r 00e4e08af4f5 .hgsubstate
--- a/.hgsubstate	Wed Aug 17 09:31:48 2011 -0400
+++ b/.hgsubstate	Wed Aug 17 10:37:40 2011 -0400
@@ -8,7 +8,7 @@
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 b28e7be63235982501ab7dd30c03ea7feef7b095 vim/bundle/nerdcommenter
 2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
-fd814c429e5269da10df87429b62c570617456f2 vim/bundle/pydoc
+a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc
 66df9aaae2b3c80bb227b876da48ae63a9fce355 vim/bundle/slimv
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
diff -r 5bd004df0240 -r 00e4e08af4f5 vim/.vimrc
--- a/vim/.vimrc	Wed Aug 17 09:31:48 2011 -0400
+++ b/vim/.vimrc	Wed Aug 17 10:37:40 2011 -0400
@@ -642,6 +642,8 @@
 " }}}
 " Pydoc {{{
 
+let g:pydoc_perform_mappings = 0
+
 au FileType python noremap <buffer> <localleader>ds :call ShowPyDoc('<C-R><C-W>', 1)<CR>
 au FileType python noremap <buffer> <localleader>dS :call ShowPyDoc('<C-R><C-A>', 1)<CR>