master 00802c0: Reset the pulse face more fully in pulse-reset-face

[Lars Ingebrigtsen]

branch: master
commit 00802c0cfeea4218802509693ca0f5d2593f8a7c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Reset the pulse face more fully in pulse-reset-face
    
    * lisp/cedet/pulse.el (pulse-reset-face): Reset the :extend to nil
    if there's no face given (bug#48936).
---
 lisp/cedet/pulse.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 62b2072..54b14c6 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -120,9 +120,10 @@ Face used for temporary highlighting of tags for effect."
                           (face-background face nil t)
                         (face-background 'pulse-highlight-start-face)
                         ))
-  (and face
-       (set-face-extend 'pulse-highlight-face
-                        (face-extend-p face nil t)))
+  (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)))
   (put 'pulse-highlight-face :startface (or face
                                            'pulse-highlight-start-face))
   (setq pulse-momentary-iteration 0))