From c3ca73b4ce1e0e938e6a77a95fc9b42f9e0d36f4 Mon Sep 17 00:00:00 2001
From: yoichi <yoichi>
Date: Sat, 15 Sep 2001 05:12:25 +0000
Subject: [PATCH] Don't require x-face to use x-face-mule. Adopt setting for
 x-face-mule distributed with bitmap-mule.

---
 samples/en/dot.wl |   17 +++++++----------
 samples/ja/dot.wl |   17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index bb5d6c2..4e49ec1 100644
--- 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
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -311,20 +311,17 @@
 (setq wl-view-visible-field-list '("^Message-Id:"))
 
 
-;; X-Face を表示する (要 x-face (and x-face-mule))
-(when (and window-system
-	   (module-installed-p 'x-face))
-  (cond ((featurep 'xemacs)		; for XEmacs
+;; X-Face を表示する (要 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以降
-	 (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))
 	))
 
 ;; スコア機能の設定
-- 
1.7.10.4