# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1409586441 25200
# Node ID 477efa0013fd77579264043898d2139df752a4c9
# Parent  a903bd42d8d90a1bab26fe5486471dc8c2ee5613# Parent  4bd15b5afcfc2ab7118d22201302479ba9175ea0
Merge changes.

diff -r 4bd15b5afcfc -r 477efa0013fd .hgignore
--- a/.hgignore	Fri Aug 22 17:19:29 2014 -0700
+++ b/.hgignore	Mon Sep 01 08:47:21 2014 -0700
@@ -3,6 +3,7 @@
 temp/*
 backup/*
 cache/*
+tags/*
 .netrwhist
 hgrc/hgrc-local
 vim/vimrc-local
diff -r 4bd15b5afcfc -r 477efa0013fd .hgsubstate
--- a/.hgsubstate	Fri Aug 22 17:19:29 2014 -0700
+++ b/.hgsubstate	Mon Sep 01 08:47:21 2014 -0700
@@ -1,7 +1,7 @@
 f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths
-51b3b3b4927e876b8815c3f7242b56b189189b13 lib/hg/hg-git
+83e1c73136251271d8acbf92e05100ea175f904b lib/hg/hg-git
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
-b13e1141aa5cd72c85d7e0fef31feb7f159fdd64 vim/bundle/autotags
+bd136cb41034b5cdef3348e7370ee283d2d167e1 vim/bundle/autotags
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes
 a3ae0df1d9e13941e9e8086637055841ce93f7bd vim/bundle/commentary
@@ -10,7 +10,7 @@
 8f0b8edfbd246c0026b7a2388e1d883d579ac7f6 vim/bundle/fugitive
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
-497f7a481599ed41682110343564d7b72fd8d36e vim/bundle/lawrencium
+8ec747b13dc12dd653e2ec715c939596b3b2457e vim/bundle/lawrencium
 5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less
 b69e54f4bf0a0ee26f6582ee8764b25529610c88 vim/bundle/linediff
 61deff1362b5ea4c63eead77a52c51316fa7d433 vim/bundle/markdown
diff -r 4bd15b5afcfc -r 477efa0013fd hgrc/hgrc
--- a/hgrc/hgrc	Fri Aug 22 17:19:29 2014 -0700
+++ b/hgrc/hgrc	Mon Sep 01 08:47:21 2014 -0700
@@ -14,6 +14,7 @@
 shelve =
 record =
 rebase =
+shelve =
 convert =
 extdiff =
 schemes =
diff -r 4bd15b5afcfc -r 477efa0013fd vim/vimrc
--- a/vim/vimrc	Fri Aug 22 17:19:29 2014 -0700
+++ b/vim/vimrc	Mon Sep 01 08:47:21 2014 -0700
@@ -239,10 +239,17 @@
 
 " }}}
 
+" Autotags {{{
+
+let g:autotags_exclude = ['venv', 'build', 'static', 'node_modules']
+let g:autotags_cache_dir = s:vim_home.'/tags'
+
+" }}}
+
 " Syntastic {{{
 
 " Use `pyflakes` with `syntastic`.
-let g:syntastic_python_checkers = ['pyflakes']
+"let g:syntastic_python_checkers = ['pyflakes']
 
 " }}}
 
@@ -254,7 +261,7 @@
             \}
 
 " Make the annotate window better in Lawrencium.
-let g:lawrencium_annotate_width_offset = 0
+let g:lawrencium_annotate_width_offset = 1
 
 " }}}
 
@@ -408,7 +415,6 @@
 " Ctrl-P mappings.
 nnoremap <silent> <C-p> :CtrlP<cr>
 nnoremap <silent> <C-o> :CtrlPBuffer<cr>
-nnoremap <silent> <C-i> :CtrlPBufTag<cr>
 nnoremap <silent> <C-u> :CtrlPTag<cr>
 nnoremap <silent> <C-y> :CtrlPQuickfix<cr>
 nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
@@ -440,6 +446,25 @@
 vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR><c-o>
 vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR><c-o>
 
+" Jump to tags by keeping things better in view. Option for jumping to a tag
+" in a split window where everything is folded except what you need to see.
+function! JumpToTag()
+    execute "normal! \<c-]>zz"
+endfunction
+function! JumpToTagInSplit()
+    execute "normal! \<c-w>v\<c-]>zMzvzz"
+endfunction
+nnoremap <c-]> :silent! call JumpToTag()<cr>
+nnoremap <c-\> :silent! call JumpToTagInSplit()<cr>
+
+" Keep search matches in the middle of the window.
+nnoremap n nzzzv
+nnoremap N Nzzzv
+
+" Same when jumping around
+nnoremap g; g;zz
+nnoremap g, g,zz
+
 " }}}
 
 " Folding {{{