aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2013-01-24 22:19:02 +0100
committerBastien Guerry2013-01-24 22:19:02 +0100
commit3d4147bae3f03502acb3d12a5c9747129cc0c6aa (patch)
tree6a9cd4953c6ba80ed63f354c5ac033e5bef600e7
parente1ffa412b4ebd244c834854098031756743236e0 (diff)
downloademacs-3d4147bae3f03502acb3d12a5c9747129cc0c6aa.tar.gz
emacs-3d4147bae3f03502acb3d12a5c9747129cc0c6aa.zip
* paren.el (show-paren-function): Make sure to set 'priority and
'face only if the overlay does exist.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/paren.el9
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c4f8f37a9b..5efa7810ad2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-01-24 Aaron Ecay <aaronecay@gmail.com> (tiny change)
2
3 * paren.el (show-paren-function): Make sure to set 'priority and
4 'face only if the overlay does exist.
5
12013-01-24 Michael Albinus <michael.albinus@gmx.de> 62013-01-24 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-tramp-file-p): Check, whether NAME is unibyte. 8 * net/tramp.el (tramp-tramp-file-p): Check, whether NAME is unibyte.
diff --git a/lisp/paren.el b/lisp/paren.el
index bf2238d4907..a9d3be60622 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -259,11 +259,10 @@ matching parenthesis is highlighted in `show-paren-style' after
259 (- (point) dir))))) 259 (- (point) dir)))))
260 (if show-paren-overlay 260 (if show-paren-overlay
261 (move-overlay show-paren-overlay from to (current-buffer)) 261 (move-overlay show-paren-overlay from to (current-buffer))
262 (setq show-paren-overlay (make-overlay from to nil t))))) 262 (setq show-paren-overlay (make-overlay from to nil t))))
263 ;; 263 ;; Always set the overlay face, since it varies.
264 ;; Always set the overlay face, since it varies. 264 (overlay-put show-paren-overlay 'priority show-paren-priority)
265 (overlay-put show-paren-overlay 'priority show-paren-priority) 265 (overlay-put show-paren-overlay 'face face))))
266 (overlay-put show-paren-overlay 'face face)))
267 ;; show-paren-mode is nil in this buffer. 266 ;; show-paren-mode is nil in this buffer.
268 (and show-paren-overlay 267 (and show-paren-overlay
269 (delete-overlay show-paren-overlay)) 268 (delete-overlay show-paren-overlay))