Merge branch 'master' into nin

Conflicts:
	autoload/vundle/scripts.vim
This commit is contained in:
gmarik 2011-08-02 14:54:33 -05:00
commit f8e887357e

View File

@ -7,9 +7,10 @@ func! vundle#scripts#all(bang, ...)
else else
let matches = filter(s:load_scripts(a:bang), 'v:val =~? "'.escape(a:1,'"').'"') let matches = filter(s:load_scripts(a:bang), 'v:val =~? "'.escape(a:1,'"').'"')
call s:display(info + ['"Search results for: '.a:1], matches) call s:display(info + ['"Search results for: '.a:1], matches)
if &hls
" TODO: search doesn't get highlighted for me
let @/=a:1 let @/=a:1
" TODO: highlight doesn't work endif
setl hls
let b:match = a:1 let b:match = a:1
endif endif
redraw! redraw!
@ -27,7 +28,7 @@ endf
func! vundle#scripts#setup_view() abort func! vundle#scripts#setup_view() abort
setl cursorline norelativenumber nonu setl cursorline norelativenumber nonu
setl hls ro noma ignorecase syntax=vim setl ro noma ignorecase syntax=vim
syn keyword vimCommand Bundle syn keyword vimCommand Bundle