From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 13 Jun 2021 13:38:52 +0000 (+0200)
Subject: Fix previous pulse.el fix
X-Git-Tag: emacs-28.0.90~2127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f7a115a9c876e69296974e8e02ece569df988e9;p=emacs.git

Fix previous pulse.el fix

* lisp/cedet/pulse.el (pulse-reset-face): Fix up previous
pulse-reset-face change -- reset back to the start face
(bug#48936).
---

diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 54b14c67ed1..7928fa1bf42 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -121,9 +121,8 @@ Face used for temporary highlighting of tags for effect."
 			 (face-background 'pulse-highlight-start-face)
 			 ))
   (set-face-extend 'pulse-highlight-face
-                   ;; If there's a face, use the :extend from that.
-                   ;; Otherwise, set it to nil.
-                   (and face (face-extend-p face nil t)))
+                   (face-extend-p (or face 'pulse-highlight-start-face)
+                                  nil t))
   (put 'pulse-highlight-face :startface (or face
 					    'pulse-highlight-start-face))
   (setq pulse-momentary-iteration 0))