procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/smie.el (smie-highlight-matching-block): Always turn

Browse source 
off the highlight first.

* lisp/progmodes/octave.el (octave-indent-comment): Tweak regexps.
(octave-help): Small simplification.

* test/indent/octave.m: Tweak.
This commit is contained in:
Leo Liu 2013-05-29 14:50:48 +08:00
parent bc74a74a5d
commit f236dd8432
5 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/emacs-lisp/smie.el
View file

@ -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)