From f236dd8432cad5f39088e4b99a44478e21930e4d Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Wed, 29 May 2013 14:50:48 +0800 Subject: * lisp/emacs-lisp/smie.el (smie-highlight-matching-block): Always turn off the highlight first. * lisp/progmodes/octave.el (octave-indent-comment): Tweak regexps. (octave-help): Small simplification. * test/indent/octave.m: Tweak. --- lisp/emacs-lisp/smie.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 9e338a0f4be..a88b9d70930 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1060,10 +1060,10 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'. beg end (current-buffer)) (overlay-put smie--highlight-matching-block-overlay 'face 'smie-matching-block-highlight)))) - (save-excursion - (condition-case nil - (if (nth 8 (syntax-ppss)) - (overlay-put smie--highlight-matching-block-overlay 'face nil) + (overlay-put smie--highlight-matching-block-overlay 'face nil) + (unless (nth 8 (syntax-ppss)) + (save-excursion + (condition-case nil (let ((token (or (funcall beg-of-tok) (funcall beg-of-tok @@ -1082,11 +1082,8 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'. (let ((beg (point)) (opener (funcall smie-forward-token-function))) (when (assoc opener smie-closer-alist) - (funcall highlight beg (point))))) - (t (overlay-put smie--highlight-matching-block-overlay - 'face nil))))) - (scan-error - (overlay-put smie--highlight-matching-block-overlay 'face nil))))))) + (funcall highlight beg (point))))))) + (scan-error))))))) (defvar smie--highlight-matching-block-timer nil) -- cgit v1.2.3