From 5a6d0ffb5b645e473660a3e656ef16bfdad5e332 Mon Sep 17 00:00:00 2001
From: kaoru <kaoru>
Date: Mon, 10 Dec 2001 13:10:51 +0000
Subject: [PATCH] Fixed x-face example for x-face-e21.

---
 samples/en/dot.wl |   16 ++++++++++++----
 samples/ja/dot.wl |   16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index 8e51bc0..ec7ffab 100644
--- a/samples/en/dot.wl
+++ b/samples/en/dot.wl
@@ -316,15 +316,23 @@
 ;; This value precedes `wl-message-ignored-field-list'
 (setq wl-message-visible-field-list '("^Message-Id:"))
 
-;; X-Face (requires x-face or bitmap-mule)
+;; X-Face
 (when window-system
-  (cond ((and (featurep 'xemacs)		; for XEmacs
+  (cond ((and (featurep 'xemacs)	; for XEmacs
 	      (module-installed-p 'x-face))
 	 (autoload 'x-face-xmas-wl-display-x-face "x-face")
 	 (setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face))
-	;; for Mule (GNU Emacs)
+
+	;; for Emacs21
+	((and (not (featurep 'xemacs))
+	      (= emacs-major-version 21)
+	      (module-installed-p 'x-face-e21))
+	 (autoload 'x-face-decode-message-header "x-face-e21")
+	 (setq wl-highlight-x-face-function 'x-face-decode-message-header))
+
+	;; for Emacs 19.34, Emacs 20.x
 	((module-installed-p 'x-face-mule)
-	 ;; for x-face-mule distributed with bitmap-mule 8.0 or later
+	 ;; 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))
 	))
diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl
index 2653803..592ca8d 100644
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -323,15 +323,23 @@
 (setq wl-message-visible-field-list '("^Message-Id:"))
 
 
-;; X-Face を表示する (要 x-face or bitamap-mule)
+;; X-Face を表示する
 (when window-system
-  (cond ((and (featurep 'xemacs)		; for XEmacs
+  (cond ((and (featurep 'xemacs)	; for XEmacs
 	      (module-installed-p 'x-face))
 	 (autoload 'x-face-xmas-wl-display-x-face "x-face")
 	 (setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face))
-	;; for Mule (GNU Emacs)
+
+	;; for Emacs21
+	((and (not (featurep 'xemacs))
+	      (= emacs-major-version 21)
+	      (module-installed-p 'x-face-e21))
+	 (autoload 'x-face-decode-message-header "x-face-e21")
+	 (setq wl-highlight-x-face-function 'x-face-decode-message-header))
+
+	;; for Emacs 19.34, Emacs 20.x
 	((module-installed-p 'x-face-mule)
-	 ;; for x-face-mule distributed with bitmap-mule 8.0 or later
+	 ;; 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