Deduplicate s:highlight_current_match logic
Merge pull request #15 from nkouevda/current

Deduplicate s:highlight_current_match logic