Fixed x-face example for x-face-e21.

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index 8e51bc0..ec7ffab 100644 (file)
--- 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 (file)
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -323,15 +323,23 @@
 (setq wl-message-visible-field-list '("^Message-Id:"))
 
 
-;; X-Face \e$B$rI=<($9$k\e(B (\e$BMW\e(B x-face or bitamap-mule)
+;; X-Face \e$B$rI=<($9$k\e(B
 (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))
        ))