(wl-demo): Fix the last change.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c0a5791..524127e 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-10  Katsumi Yamaoka    <yamaoka@jpl.org>
+
+       * wl-demo.el (wl-demo): Fix the last change.
+
 2000-07-07  Katsumi Yamaoka    <yamaoka@jpl.org>
 
        * wl-demo.el (wl-demo): Don't use `eval'.

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 690dca2..8de6332 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -249,11 +249,12 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
              (set-extent-end-glyph (make-extent (point) (point)) image))
             ((featurep 'image)
              (if (eq 'wl-logo-xbm logo)
-                 (progn
-                   (plist-put (cdr image) ':background
-                              (face-background 'wl-highlight-logo-face))
-                   (plist-put (cdr image) ':foreground
-                              (face-foreground 'wl-highlight-logo-face))))
+                 (let ((bg (face-background 'wl-highlight-logo-face))
+                       (fg (face-foreground 'wl-highlight-logo-face)))
+                   (if (stringp bg)
+                       (plist-put (cdr image) ':background bg))
+                   (if (stringp fg)
+                       (plist-put (cdr image) ':foreground fg))))
              (setq rest (/ (- (* wh (frame-char-height)) lh 1)
                            (frame-char-height)))
              (insert-char ?\  (max 0 (/ (- (* (frame-char-width) (1+ ww)) lw)