update highlight-symbol and fix conflict with emacs 24.4