Merge branch 'fix-highlight-restore-E416' of https://github.com/blueyed/vim-easymotion into blueyed-fix-highlight-restore-E416

close #95 #78

Conflicts:
	autoload/EasyMotion.vim
	autoload/vital/_easymotion/Over/Commandline.vim
This commit is contained in:
haya14busa 2014-02-10 20:39:44 +09:00
commit 697c05d8bd

View File

@ -384,7 +384,9 @@ function! s:turn_off_hl_error() "{{{
finally
let &verbose = save_verbose
endtry
let hl = substitute(matchstr(error, 'xxx \zs.*'), '[ \t\n]\+\|cleared', ' ', 'g')
" NOTE: do not match across newlines, to remove 'links to Foo'
" (https://github.com/Lokaltog/vim-easymotion/issues/95)
let hl = substitute(matchstr(error, 'xxx \zs[^\n]*'), '[ \t\n]\+\|cleared', ' ', 'g')
if !empty(substitute(hl, '\s', '', 'g'))
let s:old_hl_error = hl
endif