Mercurial > dotfiles
comparison 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 |
comparison
equal
deleted
inserted
replaced
126:bb4697ae7425 | 131:a273867b6a0d |
---|---|
27 endif | 27 endif |
28 | 28 |
29 " Get our vim directory. | 29 " Get our vim directory. |
30 let s:vim_home = expand("<sfile>:h") | 30 let s:vim_home = expand("<sfile>:h") |
31 | 31 |
32 " Make sure `filetype` stuff is turned off before loading Pathogen. | |
33 syntax off | |
34 filetype off | |
35 | |
32 " Disable some plugins. | 36 " Disable some plugins. |
33 let g:pathogen_disabled = [] | 37 let g:pathogen_disabled = [] |
38 call add(g:pathogen_disabled, 'vimroom') | |
34 call add(g:pathogen_disabled, 'minibufexpl') | 39 call add(g:pathogen_disabled, 'minibufexpl') |
35 call add(g:pathogen_disabled, 'ragtag') | 40 call add(g:pathogen_disabled, 'ragtag') |
36 call add(g:pathogen_disabled, 'vimroom') | 41 call add(g:pathogen_disabled, 'fugitive') |
37 | 42 |
38 " Load pathogen. | 43 " Load pathogen. |
39 call pathogen#infect() | 44 call pathogen#infect() |
40 | 45 |
41 " Hide the toolbar in MacVim/gVIM, and set a nice window size. | 46 " Hide the toolbar in MacVim/gVIM, and set a nice window size. |
215 let g:ctrlp_working_path_mode = 2 | 220 let g:ctrlp_working_path_mode = 2 |
216 | 221 |
217 " Ctrl-P should however ignore some stuff. | 222 " Ctrl-P should however ignore some stuff. |
218 let g:ctrlp_custom_ignore = { | 223 let g:ctrlp_custom_ignore = { |
219 \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv)$', | 224 \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv)$', |
220 \ 'file': '\.exe$\|\.so$\|\.dll$' | 225 \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$' |
221 \ } | 226 \ } |
222 | 227 |
223 " Make Ctrl-P cache stuff in our temp directory. | 228 " Make Ctrl-P cache stuff in our temp directory. |
224 let g:ctrlp_cache_dir = s:vim_home.'/cache' | 229 let g:ctrlp_cache_dir = s:vim_home.'/cache' |
225 | 230 |
226 " Open Hg! commands in a normal buffer. | 231 " Use `pyflakes` with `syntastic`. |
227 let g:lawrencium_hg_bang_edit_command = 'edit' | 232 let g:syntastic_python_checker = 'pyflakes' |
228 | 233 |
234 " Custom Mercurial commands highlighting in Lawrencium. | |
229 let g:lawrencium_hg_commands_file_types = { | 235 let g:lawrencium_hg_commands_file_types = { |
230 \'clog': 'hggraphlog' | 236 \'clog': 'hggraphlog' |
231 \} | 237 \} |
238 | |
239 " Make the annotate window better in Lawrencium. | |
240 let g:lawrencium_annotate_width_offset = 0 | |
232 | 241 |
233 " }}} | 242 " }}} |
234 | 243 |
235 " File-Specific Settings {{{ | 244 " File-Specific Settings {{{ |
236 | 245 |