changeset 162:254c4f068808

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 03 Jan 2014 19:38:57 -0800
parents 2eca71d533ce (current diff) 967328f9896b (diff)
children 925df140ae95
files vim/vimrc vimperatorrc
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vim/vimrc	Fri Jan 03 19:36:33 2014 -0800
+++ b/vim/vimrc	Fri Jan 03 19:38:57 2014 -0800
@@ -221,14 +221,14 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|node_modules|build)$'
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build|node_modules)$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
 " Use `pyflakes` with `syntastic`.
-let g:syntastic_python_checkers = ['pyflakes']
+let g:syntastic_python_checkers = ['pyflakes', 'pylint']
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
--- a/vimperatorrc	Fri Jan 03 19:36:33 2014 -0800
+++ b/vimperatorrc	Fri Jan 03 19:38:57 2014 -0800
@@ -45,4 +45,8 @@
 " Super minimal UI
 set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs
 
+" Websites with useful keyboard shortcuts already
+ignorekeys add -except=:,J,K,b fastmail.fm
+ignorekeys add -except=:,J,K,b feedly.com
+
 " vim: ft=vim