[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112621: * emacs-lisp/smie.el (smie-h
From: |
Leo Liu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112621: * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean |
Date: |
Fri, 17 May 2013 12:33:12 +0800 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112621
fixes bug: http://debbugs.gnu.org/14395
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-17 12:33:12 +0800
message:
* emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean
up when turned off.
(smie--highlight-matching-block-overlay): No longer buffer-local.
(smie-highlight-matching-block): Adjust.
modified:
lisp/ChangeLog
lisp/emacs-lisp/smie.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-17 04:09:16 +0000
+++ b/lisp/ChangeLog 2013-05-17 04:33:12 +0000
@@ -1,3 +1,10 @@
+2013-05-17 Leo Liu <address@hidden>
+
+ * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean
+ up when turned off. (Bug#14395)
+ (smie--highlight-matching-block-overlay): No longer buffer-local.
+ (smie-highlight-matching-block): Adjust.
+
2013-05-17 Paul Eggert <address@hidden>
Doc string fix for "nanoseconds" (Bug#14406).
=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el 2013-05-16 22:58:58 +0000
+++ b/lisp/emacs-lisp/smie.el 2013-05-17 04:33:12 +0000
@@ -1025,7 +1025,7 @@
"Face used to highlight matching block."
:group 'smie)
-(defvar-local smie--highlight-matching-block-overlay nil)
+(defvar smie--highlight-matching-block-overlay nil)
(defvar-local smie--highlight-matching-block-lastpos -1)
(defun smie-highlight-matching-block ()
@@ -1056,7 +1056,8 @@
nil))))
(highlight
(lambda (beg end)
- (move-overlay smie--highlight-matching-block-overlay beg end)
+ (move-overlay smie--highlight-matching-block-overlay
+ beg end (current-buffer))
(overlay-put smie--highlight-matching-block-overlay
'face 'smie-matching-block-highlight))))
(save-excursion
@@ -1095,10 +1096,15 @@
(when (timerp smie--highlight-matching-block-timer)
(cancel-timer smie--highlight-matching-block-timer))
(setq smie--highlight-matching-block-timer nil)
- (when smie-highlight-matching-block-mode
- (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local)
- (setq smie--highlight-matching-block-timer
- (run-with-idle-timer 0.2 t #'smie-highlight-matching-block))))
+ (if smie-highlight-matching-block-mode
+ (progn
+ (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local)
+ (setq smie--highlight-matching-block-timer
+ (run-with-idle-timer 0.2 t #'smie-highlight-matching-block)))
+ (when smie--highlight-matching-block-overlay
+ (delete-overlay smie--highlight-matching-block-overlay)
+ (setq smie--highlight-matching-block-overlay nil))
+ (kill-local-variable 'smie--highlight-matching-block-lastpos)))
;;; The indentation engine.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112621: * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean,
Leo Liu <=