[Emacs-diffs] /srv/bzr/emacs/trunk r111598: * paren.el (show-paren-function): Make sure to set 'priority and

[Bastien Guerry]

------------------------------------------------------------
revno: 111598
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-24 22:19:02 +0100
message:
  * paren.el (show-paren-function): Make sure to set 'priority and
  'face only if the overlay does exist.
modified:
  lisp/ChangeLog
  lisp/paren.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-24 09:50:02 +0000
+++ b/lisp/ChangeLog    2013-01-24 21:19:02 +0000
@@ -1,3 +1,8 @@
+2013-01-24  Aaron Ecay <address@hidden>  (tiny change)
+
+       * paren.el (show-paren-function): Make sure to set 'priority and
+       'face only if the overlay does exist.
+
 2013-01-24  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-tramp-file-p): Check, whether NAME is unibyte.

=== modified file 'lisp/paren.el'
--- a/lisp/paren.el     2013-01-23 09:43:29 +0000
+++ b/lisp/paren.el     2013-01-24 21:19:02 +0000
@@ -259,11 +259,10 @@
                            (- (point) dir)))))
              (if show-paren-overlay
                  (move-overlay show-paren-overlay from to (current-buffer))
-               (setq show-paren-overlay (make-overlay from to nil t)))))
-         ;;
-         ;; Always set the overlay face, since it varies.
-         (overlay-put show-paren-overlay 'priority show-paren-priority)
-         (overlay-put show-paren-overlay 'face face)))
+               (setq show-paren-overlay (make-overlay from to nil t))))
+            ;; Always set the overlay face, since it varies.
+            (overlay-put show-paren-overlay 'priority show-paren-priority)
+            (overlay-put show-paren-overlay 'face face))))
     ;; show-paren-mode is nil in this buffer.
     (and show-paren-overlay
         (delete-overlay show-paren-overlay))