Merge branch 'master' into simple-automated-install
* master: Fix ctrlp settings that conflict with Fugitive [closes #18]
This commit is contained in:
commit
00e0886f7d
@ -1,3 +1,5 @@
|
|||||||
|
let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
|
||||||
|
|
||||||
" Default to filename searches - so that appctrl will find application
|
" Default to filename searches - so that appctrl will find application
|
||||||
" controller
|
" controller
|
||||||
let g:ctrlp_by_filename = 1
|
let g:ctrlp_by_filename = 1
|
||||||
@ -13,6 +15,7 @@ nnoremap <C-b> :CtrlPBuffer<cr>
|
|||||||
" Cmd-Shift-P to clear the cache
|
" Cmd-Shift-P to clear the cache
|
||||||
nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
|
nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
|
||||||
|
|
||||||
|
|
||||||
" Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
|
" Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
|
||||||
" Open CtrlP starting from a particular path, making it much
|
" Open CtrlP starting from a particular path, making it much
|
||||||
" more likely to find the correct thing first. mnemonic 'jump to [something]'
|
" more likely to find the correct thing first. mnemonic 'jump to [something]'
|
||||||
|
1
vimrc
1
vimrc
@ -86,7 +86,6 @@ set nofoldenable "dont fold by default
|
|||||||
set wildmode=list:longest
|
set wildmode=list:longest
|
||||||
set wildmenu "enable ctrl-n and ctrl-p to scroll thru matches
|
set wildmenu "enable ctrl-n and ctrl-p to scroll thru matches
|
||||||
set wildignore=*.o,*.obj,*~ "stuff to ignore when tab completing
|
set wildignore=*.o,*.obj,*~ "stuff to ignore when tab completing
|
||||||
set wildignore+=*/.git/*,*/.hg/*,*/.svn/*
|
|
||||||
set wildignore+=*vim/backups*
|
set wildignore+=*vim/backups*
|
||||||
|
|
||||||
"
|
"
|
||||||
|
Loading…
Reference in New Issue
Block a user