Fix the most recent change.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 331297b..a9e8f41 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,13 +1,10 @@
 2001-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * wl-demo.el (wl-demo-insert-image): Make Emacs 21 use BITMAP-MULE
-       for xbm if the new redisplay engine is not available.
-
-2001-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * wl-demo.el (wl-demo-image-type-alist): Add bitmap for Emacs 21.
+       * wl-demo.el (wl-demo-image-type-alist): Add bitmap, prefer xbm
+       rather than bitmap on Emacs 21.
        (wl-demo-insert-image): Decode bitmap data line by line when Emacs
-       21 is running (cf. mule-ja:08245).
+       21 is running (cf. mule-ja:08245); make Emacs 21 use BITMAP-MULE
+       for xbm if the new redisplay engine is not available.
 
 2001-12-11  Yuuichi Teranishi  <teranisi@gohome.org>
 

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index fc4bec4..e66c190 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -122,7 +122,8 @@ Yet Another Message Interface On Emacsen"
                                 (module-installed-p 'bitmap)
                                 (setq wl-demo-bitmap-mule-available-p t))))
               '("bitmap" . bitmap))))
-       (if wl-on-emacs21
+       (if (and wl-on-emacs21
+                (image-type-available-p 'xbm))
            ;; Prefer xbm rather than bitmap on Emacs 21.
            (delq nil (list xpm xbm bitmap '("ascii")))
          (delq nil (list xpm bitmap xbm '("ascii")))))