From: Stephen Leake <stephen_leake@stephe-leake.org>
Date: Sat, 15 Aug 2015 17:14:27 +0000 (-0500)
Subject: Handle pulse-background being nil
X-Git-Tag: emacs-25.0.90~1373^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6d4bafa1de2aa3ae2bb8cba5825d4a6f248ed0a;p=emacs.git

Handle pulse-background being nil

* lisp/cedet/pulse.el (pulse-lighten-highlight): Inherit
pulse-background, handle it being nil.
---

diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 39ba13c33df..dea73a06e2a 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -131,25 +131,28 @@ Return t if there is more drift to do, nil if completed."
   (if (>= (get 'pulse-highlight-face :iteration) pulse-iterations)
       nil
     (let* ((frame (color-values (face-background 'default)))
-	   (start (color-values (face-background
-				 (get 'pulse-highlight-face
-				      :startface)
-                                 nil t)))
-	   (frac  (list (/ (- (nth 0 frame) (nth 0 start)) pulse-iterations)
-			(/ (- (nth 1 frame) (nth 1 start)) pulse-iterations)
-			(/ (- (nth 2 frame) (nth 2 start)) pulse-iterations)))
-	   (it (get 'pulse-highlight-face :iteration))
-	   )
-      (set-face-background 'pulse-highlight-face
-			   (pulse-color-values-to-hex
-			    (list
-			     (+ (nth 0 start) (* (nth 0 frac) it))
-			     (+ (nth 1 start) (* (nth 1 frac) it))
-			     (+ (nth 2 start) (* (nth 2 frac) it)))))
-      (put 'pulse-highlight-face :iteration (1+ it))
-      (if (>= (1+ it) pulse-iterations)
-	  nil
-	t))))
+	   (pulse-background (face-background
+			      (get 'pulse-highlight-face
+				   :startface)
+                              nil t)));; can be nil
+      (when pulse-background
+	(let* ((start (color-values pulse-background))
+	       (frac  (list (/ (- (nth 0 frame) (nth 0 start)) pulse-iterations)
+			    (/ (- (nth 1 frame) (nth 1 start)) pulse-iterations)
+			    (/ (- (nth 2 frame) (nth 2 start)) pulse-iterations)))
+	       (it (get 'pulse-highlight-face :iteration))
+	       )
+	  (set-face-background 'pulse-highlight-face
+			       (pulse-color-values-to-hex
+				(list
+				 (+ (nth 0 start) (* (nth 0 frac) it))
+				 (+ (nth 1 start) (* (nth 1 frac) it))
+				 (+ (nth 2 start) (* (nth 2 frac) it)))))
+	  (put 'pulse-highlight-face :iteration (1+ it))
+	  (if (>= (1+ it) pulse-iterations)
+	      nil
+	    t)))
+      )))
 
 (defun pulse-reset-face (&optional face)
   "Reset the pulse highlighting FACE."