Merge pull request #1798 from fjcapdevila/master

Fix #1470 - highlighting for variable with 2 characters names
Do not search after saving a file or changing between tabs.
Merge branch 'issue1560-do_not_find_after_save'