Mercurial > dotfiles.old
comparison vimrc @ 102:a25bdb562e43
Fix zsh prompt
author | zegervdv <zegervdv@me.com> |
---|---|
date | Sun, 10 Aug 2014 11:37:27 +0200 |
parents | 368f742876cf |
children | e7c5a1fffc5e |
comparison
equal
deleted
inserted
replaced
101:368f742876cf | 102:a25bdb562e43 |
---|---|
428 let g:unite_enable_start_insert=0 | 428 let g:unite_enable_start_insert=0 |
429 let g:unite_source_history_yank_enable=1 | 429 let g:unite_source_history_yank_enable=1 |
430 let g:unite_source_rec_max_cache_files=5000 | 430 let g:unite_source_rec_max_cache_files=5000 |
431 let g:unite_prompt='» ' | 431 let g:unite_prompt='» ' |
432 if executable('ag') | 432 if executable('ag') |
433 let g:unite_source_grep_command='ag' | 433 let g:unite_source_grep_command = 'ag' |
434 let g:unite_source_grep_default_opts='--nocolor --line-numbers --nogroup -S -C4' | 434 let g:unite_source_grep_default_opts = |
435 let g:unite_source_grep_recursive_opt='' | 435 \ '-i --line-numbers --nocolor --nogroup --hidden --ignore ' . |
436 \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' | |
437 let g:unite_source_grep_recursive_opt = '' | |
436 elseif executable('ack') | 438 elseif executable('ack') |
437 let g:unite_source_grep_command='ack' | 439 let g:unite_source_grep_command='ack' |
438 let g:unite_source_grep_default_opts='--no-heading --no-color -C4' | 440 let g:unite_source_grep_default_opts='--no-heading --no-color -C4' |
439 let g:unite_source_grep_recursive_opt='' | 441 let g:unite_source_grep_recursive_opt='' |
440 endif | 442 endif |
479 nmap <leader>c <C-_><C-_> | 481 nmap <leader>c <C-_><C-_> |
480 " }}} | 482 " }}} |
481 " Neo Complete {{{ | 483 " Neo Complete {{{ |
482 let g:neocomplete#enable_at_startup = 1 | 484 let g:neocomplete#enable_at_startup = 1 |
483 let g:neocomplet#enable_smart_case = 1 | 485 let g:neocomplet#enable_smart_case = 1 |
484 let g:jedi#auto_vim_configuration = 0 | |
485 let g:jedi#completions_enabled = 0 | |
486 let g:marching_enable_neocomplete = 1 | 486 let g:marching_enable_neocomplete = 1 |
487 let g:neocomplete#enable_fuzzy_completion = 1 | |
487 | 488 |
488 inoremap <expr><s-CR> pumvisible() ? neocomplete#smart_close_popup()"\<CR>" : "\<CR>" | 489 inoremap <expr><s-CR> pumvisible() ? neocomplete#smart_close_popup()"\<CR>" : "\<CR>" |
489 inoremap <expr><C-g> neocomplete#undo_completion() | 490 inoremap <expr><C-g> neocomplete#undo_completion() |
490 inoremap <expr><C-l> neocomplete#complete_common_string() | 491 inoremap <expr><C-l> neocomplete#complete_common_string() |
491 function! CleverCr() | 492 function! CleverCr() |
577 " Vim Sessions {{{ | 578 " Vim Sessions {{{ |
578 let g:session_autosave = 'no' | 579 let g:session_autosave = 'no' |
579 " }}} | 580 " }}} |
580 " Jedi {{{ | 581 " Jedi {{{ |
581 let g:jedi#auto_vim_configuration=0 | 582 let g:jedi#auto_vim_configuration=0 |
583 let g:jedi#completions_enabled = 0 | |
582 " }}} | 584 " }}} |
583 | 585 |
584 " Load local vimrc | 586 " Load local vimrc |
585 if filereadable($HOME . "/.vimrc.local") | 587 if filereadable($HOME . "/.vimrc.local") |
586 source ~/.vimrc.local | 588 source ~/.vimrc.local |