Mercurial > dotfiles
comparison vim/vimrc @ 316:8f49f36b76ef
Merge changes.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Mon, 10 Aug 2015 18:33:09 -0700 |
parents | 5f9d52300aaa 52d4d0fa195b |
children | b0b868bb0d44 |
comparison
equal
deleted
inserted
replaced
315:5cee1ee030cb | 316:8f49f36b76ef |
---|---|
38 " Disable some plugins. | 38 " Disable some plugins. |
39 let g:pathogen_disabled = [] | 39 let g:pathogen_disabled = [] |
40 call add(g:pathogen_disabled, 'vimroom') | 40 call add(g:pathogen_disabled, 'vimroom') |
41 call add(g:pathogen_disabled, 'minibufexpl') | 41 call add(g:pathogen_disabled, 'minibufexpl') |
42 call add(g:pathogen_disabled, 'ragtag') | 42 call add(g:pathogen_disabled, 'ragtag') |
43 call add(g:pathogen_disabled, 'interestingwords') | |
43 | 44 |
44 " Potentially add the local bundle directory. | 45 " Potentially add the local bundle directory. |
45 if isdirectory(s:vim_home.s:path_sep.'local') | 46 if isdirectory(s:vim_home.s:path_sep.'local') |
46 execute 'set runtimepath+='.s:vim_home.s:path_sep.'local' | 47 execute 'set runtimepath+='.s:vim_home.s:path_sep.'local' |
47 endif | 48 endif |
168 | 169 |
169 " How to show invisible characters | 170 " How to show invisible characters |
170 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:. | 171 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:. |
171 | 172 |
172 " Nice auto-complete menu. | 173 " Nice auto-complete menu. |
174 set complete=.,w,b,u,t | |
173 set completeopt=longest,menuone,preview | 175 set completeopt=longest,menuone,preview |
174 | 176 |
175 " Column indicators. | 177 " Column indicators. |
176 set colorcolumn=72,79 | 178 set colorcolumn=72,79 |
177 | 179 |
273 | 275 |
274 " }}} | 276 " }}} |
275 | 277 |
276 " Supertab {{{ | 278 " Supertab {{{ |
277 | 279 |
278 let g:SuperTabDefaultCompletionType = "<c-n>" | 280 let g:SuperTabDefaultCompletionType = "context" |
279 let g:SuperTabLongestHighlight = 1 | 281 let g:SuperTabLongestEnhanced = 1 |
282 let g:SuperTabLongestHighlight = 0 | |
280 let g:SuperTabCrMapping = 1 | 283 let g:SuperTabCrMapping = 1 |
281 | 284 |
282 " }}} | 285 " }}} |
283 | 286 |
284 " Lawrencium {{{ | 287 " Lawrencium {{{ |
504 " Jump to tags by keeping things better in view. Option for jumping to a tag | 507 " Jump to tags by keeping things better in view. Option for jumping to a tag |
505 " in a split window where everything is folded except what you need to see. | 508 " in a split window where everything is folded except what you need to see. |
506 " Note that if a tag search yield multiple possible results, we will still run | 509 " Note that if a tag search yield multiple possible results, we will still run |
507 " some of that `zvzz` stuff, but that's OK, the main point is to not mess up | 510 " some of that `zvzz` stuff, but that's OK, the main point is to not mess up |
508 " the result selection window either. | 511 " the result selection window either. |
509 nnoremap <c-]> <c-]>zvzz | 512 nnoremap <F9> :pop<cr> |
510 nnoremap <c-[> :pop<cr> | 513 nnoremap <F10> <c-]>zvzz |
511 nnoremap <c-\> <c-w>v<c-]>zMzvzz | 514 nnoremap <s-F10> <c-w>v<c-]>zMzvzz |
512 nnoremap <F9> :tprevious | 515 nnoremap <c-F9> :tprevious |
513 nnoremap <F10> :tnext | 516 nnoremap <c-F10> :tnext |
514 | 517 |
515 " Keep search matches in the middle of the window. | 518 " Keep search matches in the middle of the window. |
516 nnoremap n nzvzz | 519 nnoremap n nzvzz |
517 nnoremap N Nzvzz | 520 nnoremap N Nzvzz |
518 | 521 |