comparison vim/vimrc @ 162:254c4f068808

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 03 Jan 2014 19:38:57 -0800
parents 5997455e475b 967328f9896b
children 925df140ae95
comparison
equal deleted inserted replaced
161:2eca71d533ce 162:254c4f068808
219 " Ctrl-P should manage the working directory. 219 " Ctrl-P should manage the working directory.
220 let g:ctrlp_working_path_mode = 2 220 let g:ctrlp_working_path_mode = 2
221 221
222 " Ctrl-P should however ignore some stuff. 222 " Ctrl-P should however ignore some stuff.
223 let g:ctrlp_custom_ignore = { 223 let g:ctrlp_custom_ignore = {
224 \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv|node_modules|build)$' 224 \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv|build|node_modules)$'
225 \ } 225 \ }
226 226
227 " Make Ctrl-P cache stuff in our temp directory. 227 " Make Ctrl-P cache stuff in our temp directory.
228 let g:ctrlp_cache_dir = s:vim_home.'/cache' 228 let g:ctrlp_cache_dir = s:vim_home.'/cache'
229 229
230 " Use `pyflakes` with `syntastic`. 230 " Use `pyflakes` with `syntastic`.
231 let g:syntastic_python_checkers = ['pyflakes'] 231 let g:syntastic_python_checkers = ['pyflakes', 'pylint']
232 232
233 " Custom Mercurial commands highlighting in Lawrencium. 233 " Custom Mercurial commands highlighting in Lawrencium.
234 let g:lawrencium_hg_commands_file_types = { 234 let g:lawrencium_hg_commands_file_types = {
235 \'clog': 'hggraphlog' 235 \'clog': 'hggraphlog'
236 \} 236 \}