# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1439256789 25200
# Node ID 8f49f36b76efb4e49e7743199c35202a79908226
# Parent  5cee1ee030cbe05427ecc2d94ef1f83df10cfdeb# Parent  52d4d0fa195b3461d5edce8b8ef0d18eb62e7810
Merge changes.

diff -r 5cee1ee030cb -r 8f49f36b76ef vim/vimrc
--- a/vim/vimrc	Mon Aug 10 18:32:45 2015 -0700
+++ b/vim/vimrc	Mon Aug 10 18:33:09 2015 -0700
@@ -40,6 +40,7 @@
 call add(g:pathogen_disabled, 'vimroom')
 call add(g:pathogen_disabled, 'minibufexpl')
 call add(g:pathogen_disabled, 'ragtag')
+call add(g:pathogen_disabled, 'interestingwords')
 
 " Potentially add the local bundle directory.
 if isdirectory(s:vim_home.s:path_sep.'local')
@@ -170,6 +171,7 @@
 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
 
 " Nice auto-complete menu.
+set complete=.,w,b,u,t
 set completeopt=longest,menuone,preview
 
 " Column indicators.
@@ -275,8 +277,9 @@
 
 " Supertab {{{
 
-let g:SuperTabDefaultCompletionType = "<c-n>"
-let g:SuperTabLongestHighlight = 1
+let g:SuperTabDefaultCompletionType = "context"
+let g:SuperTabLongestEnhanced = 1
+let g:SuperTabLongestHighlight = 0
 let g:SuperTabCrMapping = 1
 
 " }}}
@@ -506,11 +509,11 @@
 " Note that if a tag search yield multiple possible results, we will still run
 " 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 <F9> :pop<cr>
+nnoremap <F10> <c-]>zvzz
+nnoremap <s-F10> <c-w>v<c-]>zMzvzz
+nnoremap <c-F9> :tprevious
+nnoremap <c-F10> :tnext
 
 " Keep search matches in the middle of the window.
 nnoremap n nzvzz