aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2021-06-13 15:38:52 +0200
committerLars Ingebrigtsen2021-06-13 15:38:52 +0200
commit2f7a115a9c876e69296974e8e02ece569df988e9 (patch)
treef538dee36cdeb0521fc83797cded23c15c71cc2d
parent55d7effbe1d8edae94ec9ebcd061cd2221df97e4 (diff)
downloademacs-2f7a115a9c876e69296974e8e02ece569df988e9.tar.gz
emacs-2f7a115a9c876e69296974e8e02ece569df988e9.zip
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).
-rw-r--r--lisp/cedet/pulse.el5
1 files changed, 2 insertions, 3 deletions
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."
121 (face-background 'pulse-highlight-start-face) 121 (face-background 'pulse-highlight-start-face)
122 )) 122 ))
123 (set-face-extend 'pulse-highlight-face 123 (set-face-extend 'pulse-highlight-face
124 ;; If there's a face, use the :extend from that. 124 (face-extend-p (or face 'pulse-highlight-start-face)
125 ;; Otherwise, set it to nil. 125 nil t))
126 (and face (face-extend-p face nil t)))
127 (put 'pulse-highlight-face :startface (or face 126 (put 'pulse-highlight-face :startface (or face
128 'pulse-highlight-start-face)) 127 'pulse-highlight-start-face))
129 (setq pulse-momentary-iteration 0)) 128 (setq pulse-momentary-iteration 0))