--- a/.hgsubstate Fri Mar 02 09:50:38 2012 -0500
+++ b/.hgsubstate Mon Mar 05 11:01:06 2012 -0500
@@ -2,7 +2,7 @@
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-e91eb9e79711b231e52ca6e4e6caf9ce72e4e827 vim/bundle/badwolf
+a9983b93bc23cbe81b9a5c92d5876251c47a7ac7 vim/bundle/badwolf
93cb20dbfbab723e1557801469ae70f4f46499da vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
03e138c3496926b193402f4e1542f0a99924f999 vim/bundle/fugitive
@@ -14,7 +14,7 @@
2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
d6da78f985e99d8388cd55db2587b19abc0628c2 vim/bundle/powerline
-67033ee4b9ee6d4916752da5e360b65ddf2fb525 vim/bundle/python-mode
+d27022dc0bf2302cf31015d1ca0a2f80d55f3596 vim/bundle/python-mode
fa3563dda862c1dc46ddac32d8a9f939e9077379 vim/bundle/rainbow-parentheses
6cbccd24e335319cddd96b152f6d480912375039 vim/bundle/slimv
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
--- a/vim/.vimrc Fri Mar 02 09:50:38 2012 -0500
+++ b/vim/.vimrc Mon Mar 05 11:01:06 2012 -0500
@@ -63,12 +63,14 @@
au VimResized * :wincmd =
" Cursorline {{{
-" Only show cursorline in the current window
+" Only show cursorline in the current window and in normal mode.
augroup cline
au!
- autocmd WinLeave * set nocursorline
- autocmd WinEnter * set cursorline
+ au WinLeave * set nocursorline
+ au WinEnter * set cursorline
+ au InsertEnter * set nocursorline
+ au InsertLeave * set cursorline
augroup END
" }}}
@@ -679,7 +681,7 @@
" Jesus, Python. Five characters of punctuation for a damn string?
au FileType python inoremap <buffer> <d-'> _(u'')<left><left>
- au FileType python inoremap <buffer> <d-"> """"""<left><left><left>
+ au FileType python inoremap <buffer> <c-b> """"""<left><left><left>
augroup END
" }}}
@@ -755,8 +757,7 @@
inoremap # X<BS>#
" Kill window
-nnoremap <c-c> :q<cr>
-inoremap <c-c> <esc>:q<cr>
+nnoremap K :q<cr>
" For some reason ctags refuses to ignore Python variables, so I'll just hack
" the tags file with sed and strip them out myself.
@@ -1052,7 +1053,12 @@
noremap <F2> :NERDTreeToggle<cr>
inoremap <F2> <esc>:NERDTreeToggle<cr>
-au Filetype nerdtree setlocal nolist
+augroup ps_nerdtree
+ au!
+
+ au Filetype nerdtree setlocal nolist
+ au Filetype nerdtree nnoremap <buffer> K :q<cr>
+augroup END
let NERDTreeHighlightCursorline=1
let NERDTreeIgnore = ['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o$', 'db.db', 'tags.bak']
@@ -1083,8 +1089,10 @@
let g:pymode_doc = 1
let g:pymode_doc_key = '<localleader>ds'
let g:pydoc = 'pydoc'
-let g:pymode_syntax = 0
+let g:pymode_syntax = 1
let g:pymode_syntax_all = 0
+let g:pymode_syntax_print_as_function = 0
+let g:pymode_syntax_space_errors = 0
let g:pymode_run = 0
let g:pymode_lint = 0
let g:pymode_breakpoint = 0