diff vim/vimrc @ 131:a273867b6a0d

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:28:15 -0700
parents c6f0172aac8d 1f709d7e03c6
children db9d5fe86723
line wrap: on
line diff
--- a/vim/vimrc	Tue Mar 05 13:27:49 2013 -0800
+++ b/vim/vimrc	Thu Sep 26 22:28:15 2013 -0700
@@ -29,11 +29,16 @@
 " Get our vim directory. 
 let s:vim_home = expand("<sfile>:h")
 
+" Make sure `filetype` stuff is turned off before loading Pathogen.
+syntax off
+filetype off
+
 " Disable some plugins.
 let g:pathogen_disabled = []
+call add(g:pathogen_disabled, 'vimroom')
 call add(g:pathogen_disabled, 'minibufexpl')
 call add(g:pathogen_disabled, 'ragtag')
-call add(g:pathogen_disabled, 'vimroom')
+call add(g:pathogen_disabled, 'fugitive')
 
 " Load pathogen.
 call pathogen#infect()
@@ -217,19 +222,23 @@
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
   \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv)$',
-  \ 'file': '\.exe$\|\.so$\|\.dll$'
+  \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
-" Open Hg! commands in a normal buffer.
-let g:lawrencium_hg_bang_edit_command = 'edit'
+" Use `pyflakes` with `syntastic`.
+let g:syntastic_python_checker = 'pyflakes'
 
+" Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
             \'clog': 'hggraphlog'
             \}
 
+" Make the annotate window better in Lawrencium.
+let g:lawrencium_annotate_width_offset = 0
+
 " }}}
 
 " File-Specific Settings {{{