# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1313442729 14400
# Node ID 71f41dacf190073abf3a08c924a34ff91cbb5524
# Parent  cd71b178d2892a4a66cd7fe111abf90cb8a50915
Stealing a bunch of stuff from nvie.

diff -r cd71b178d289 -r 71f41dacf190 vim/.vimrc
--- a/vim/.vimrc	Mon Aug 15 16:56:51 2011 -0400
+++ b/vim/.vimrc	Mon Aug 15 17:12:09 2011 -0400
@@ -101,6 +101,9 @@
 set background=dark
 colorscheme molokai
 
+" Highlight VCS conflict markers
+match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
+
 " }}}
 
 " }}}
@@ -492,7 +495,7 @@
 nnoremap <silent> <F6> :YRShow<cr>
 
 " Formatting, TextMate-style
-nnoremap <leader>q gqip
+nnoremap Q gqip
 
 " Easier linewise reselection
 nnoremap <leader>v V`]
@@ -615,6 +618,7 @@
 
 au Filetype nerdtree setlocal nolist
 
+let NERDTreeHighlightCursorline=1
 let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o$', 'db.db']
 
 " }}}