# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1304705347 14400
# Node ID 8f0b83a019451c45eecceaf15fb0d32b1dbf5510
# Parent  1cf909cf8e5ac0249555bda7c89638af974278d5
Pydoc and more.

diff -r 1cf909cf8e5a -r 8f0b83a01945 .hgrc
--- a/.hgrc	Thu Apr 28 17:12:48 2011 -0400
+++ b/.hgrc	Fri May 06 14:09:07 2011 -0400
@@ -30,6 +30,9 @@
 [progress]
 delay = 1.0
 
+[web]
+cacerts = /etc/hg-dummy-cert.pem
+
 [schemes]
 webf = ssh://sjl@sjl.webfactional.com/repos/
 bbs = ssh://hg@bitbucket.org/
diff -r 1cf909cf8e5a -r 8f0b83a01945 .hgsub
--- a/.hgsub	Thu Apr 28 17:12:48 2011 -0400
+++ b/.hgsub	Fri May 06 14:09:07 2011 -0400
@@ -12,3 +12,4 @@
 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
diff -r 1cf909cf8e5a -r 8f0b83a01945 .hgsubstate
--- a/.hgsubstate	Thu Apr 28 17:12:48 2011 -0400
+++ b/.hgsubstate	Fri May 06 14:09:07 2011 -0400
@@ -6,6 +6,7 @@
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter
 7650cdc6621cd15b047dc04605b8b0bc0396564d vim/bundle/nerdtree
+56c23972ad6de20e558ec7806371042529f0a41e vim/bundle/pydoc
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
diff -r 1cf909cf8e5a -r 8f0b83a01945 vim/.vimrc
--- a/vim/.vimrc	Thu Apr 28 17:12:48 2011 -0400
+++ b/vim/.vimrc	Fri May 06 14:09:07 2011 -0400
@@ -402,8 +402,8 @@
 " }}}
 " Puppet {{{
 
-au Filetype puppet set foldmethod=marker
-au Filetype puppet set foldmarker={,}
+au Filetype puppet setlocal foldmethod=marker
+au Filetype puppet setlocal foldmarker={,}
 
 " }}}
 " Firefox {{{
@@ -480,7 +480,8 @@
 
 " NERD Tree {{{
 
-map <F2> :NERDTreeToggle<cr>
+noremap <F2> :NERDTreeToggle<cr>
+inoremap <F2> <esc>:NERDTreeToggle<cr>
 let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o']
 
 " }}}