Don't require x-face to use x-face-mule.

Adopt setting for x-face-mule distributed with bitmap-mule.

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index bb5d6c2..4e49ec1 100644 (file)
--- a/samples/en/dot.wl
+++ b/samples/en/dot.wl
@@ -302,20 +302,17 @@
 ;; This value precedes `wl-message-ignored-field-list'
 (setq wl-message-visible-field-list '("^Message-Id:"))
 
-;; X-Face (requires x-face (and x-face-mule))
-(when (and window-system
-          (module-installed-p 'x-face))
-  (cond ((featurep 'xemacs)            ; for XEmacs
+;; X-Face (requires x-face or bitmap-mule)
+(when window-system
+  (cond ((and (featurep 'xemacs)               ; for XEmacs
+             (module-installed-p 'x-face))
         (autoload 'x-face-xmas-wl-display-x-face "x-face" nil t)
         (setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face))
        ;; for Mule (GNU Emacs)
        ((module-installed-p 'x-face-mule)
-        ;; x-face-mule 0.20 or later
-        (setq wl-highlight-x-face-function
-              (function
-               (lambda (&rest dummy)
-                 (x-face-decode-message-header))))
-        (require 'x-face-mule))
+        ;; for x-face-mule distributed with bitmap-mule 8.0 or later
+        (autoload 'x-face-decode-message-header "x-face-mule")
+        (setq wl-highlight-x-face-function 'x-face-decode-message-header))
        ))
 
 ;; Scoring.

diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl
index 6fd0a9c..fb8ce0a 100644 (file)
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -311,20 +311,17 @@
 (setq wl-view-visible-field-list '("^Message-Id:"))
 
 
-;; X-Face \e$B$rI=<($9$k\e(B (\e$BMW\e(B x-face (and x-face-mule))
-(when (and window-system
-          (module-installed-p 'x-face))
-  (cond ((featurep 'xemacs)            ; for XEmacs
+;; X-Face \e$B$rI=<($9$k\e(B (\e$BMW\e(B x-face or bitamap-mule)
+(when window-system
+  (cond ((and (featurep 'xemacs)               ; for XEmacs
+             (module-installed-p 'x-face))
         (autoload 'x-face-xmas-wl-display-x-face "x-face" nil t)
         (setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face))
        ;; for Mule (GNU Emacs)
        ((module-installed-p 'x-face-mule)
-        ;; x-face-mule 0.20\e$B0J9_\e(B
-        (setq wl-highlight-x-face-function
-              (function
-               (lambda (&rest dummy)
-                 (x-face-decode-message-header))))
-        (require 'x-face-mule))
+        ;; for x-face-mule distributed with bitmap-mule 8.0 or later
+        (autoload 'x-face-decode-message-header "x-face-mule")
+        (setq wl-highlight-x-face-function 'x-face-decode-message-header))
        ))
 
 ;; \e$B%9%3%"5!G=$N@_Dj\e(B