# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1438180689 25200
# Node ID de5090faf40831b2f77065b6d860e79cdd03cdf9
# Parent  ef9d3ec574af16234ea6c53042611d8d2a17840b# Parent  b09d451f351604a25598bf05e85ff456f905d2d8
Merge changes.

diff -r ef9d3ec574af -r de5090faf408 vim/vimrc
--- a/vim/vimrc	Wed Jul 29 07:36:46 2015 -0700
+++ b/vim/vimrc	Wed Jul 29 07:38:09 2015 -0700
@@ -262,6 +262,10 @@
 
 " Syntastic {{{
 
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
 " flake8 includes pyflakes, pep8, and mccabe
 " I could maybe replace pyflakes with frosted?
 let g:syntastic_python_checkers = ['flake8'] ", 'pylint']
@@ -306,19 +310,24 @@
 " Python-Mode {{{
 
 let g:pymode = 1
-let g:pymode_python = 'disable'
-let g:pymode_syntax_all = 1
+let g:pymode_python = 'python'
+
+let g:pymode_syntax = 1
+let g:pymode_syntax_all = 0
+let g:pymode_syntax_builtin_objs = 1
 let g:pymode_syntax_print_as_function = 1
 let g:pymode_syntax_space_errors = 1
+
 let g:pymode_run = 0
+
 let g:pymode_lint = 0
 let g:pymode_trim_whitespaces = 0
-let g:pymode_virtualenv = 0
 let g:pymode_folding = 1
 
-if !has('+python')
-    let g:pymode = 0
-endif
+let g:pymode_doc = 1
+let g:pymode_doc_bind = 'K'
+
+let g:pymode_virtualenv = 0
 
 " }}}
 
@@ -392,7 +401,7 @@
 " Tab navigation
 noremap <C-Tab>   :tabnext<cr>
 noremap <C-S-Tab> :tabprevious<cr>
-noremap <C-t>     :tabnew<cr>
+nnoremap <leader>t :tabnew<cr>
 
 " Window navigation
 nnoremap <C-up> :wincmd k<cr>
@@ -467,9 +476,11 @@
 nnoremap ]l :lnext<cr>zvzz
 nnoremap [l :lprevious<cr>zvzz
 
-" Same with change list.
+" Same with change and jump lists.
 nnoremap ]] g,zz
 nnoremap [[ g;zz
+nnoremap ]j <C-I>
+nnoremap [j <C-O>
 
 " Make the diff navigation also center things.
 nnoremap ]c ]czvzz
@@ -494,10 +505,10 @@
 " some of that `zvzz` stuff, but that's OK, the main point is to not mess up
 " the result selection window either.
 nnoremap <c-]> <c-]>zvzz
+nnoremap <c-[> :pop<cr>
 nnoremap <c-\> <c-w>v<c-]>zMzvzz
 nnoremap <F9>  :tprevious
 nnoremap <F10> :tnext
-nnoremap <c-s-]> :pop<cr>
 
 " Keep search matches in the middle of the window.
 nnoremap n nzvzz
@@ -581,7 +592,6 @@
     let l = line(".")
     let c = col(".")
     %s/\s\+$//e
-    let @/=''
     call cursor(l, c)
 endfunction