Update x-face section.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 9ae02b5..329eaac 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5906,7 +5906,7 @@ LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 * BBDB::                        BBDB
 * supercite::                   supercite.el
 * mu-cite::                     mu-cite.el
-* x-face-mule::                 x-face-mule.el
+* X-Face::                      x-face,bitmap-mule
 * dired-dd::                    dired-dd.el
 * MHC::                         MHC
 @end menu
@@ -5982,7 +5982,7 @@ OK \e$B$G$9!#\e(B
 @end lisp
 
 
-@node mu-cite, x-face-mule, supercite, Living with other packages
+@node mu-cite, X-Face, supercite, Living with other packages
 @subsection mu-cite.el
 @pindex mu-cite
 
@@ -6008,56 +6008,72 @@ mu-cite 8.1\e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 @end group
 @end lisp
 
-@node x-face-mule, dired-dd, mu-cite, Living with other packages
-@subsection x-face-mule.el
-@pindex x-face-mule
-@pindex bitmap-mule
+@node X-Face, dired-dd, mu-cite, Living with other packages
+@subsection x-face
+@pindex x-face
 
-x-face-mule \e$B$N%P!<%8%g%s$K$h$C$F@_Dj$,0[$J$j$^$9!#\e(B
+\e$B0J2<$N$$$:$l$+$r%$%s%9%H!<%k$9$k$3$H$G!"\e(B \e$B%a%C%;!<%8%P%C%U%!$N\e(B
+@samp{X-Face:} \e$B%U%#!<%k%I$r%G%3!<%I$7$F!"2hA|$rI=<($9$k$3$H$,$G$-$^$9!#\e(B
 
-x-face-mule 0.19\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@menu
+* x-face-xmas::                       XEmacs \e$B$N>l9g\e(B
+* x-face-mule::                       Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B
+* x-face-e21::                        Emacs 21.x \e$B$N>l9g\e(B
+@end menu
+
+\e$B$^$?!"%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
+(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
+\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
+(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
+
+
+@node x-face-xmas, x-face-mule, X-Face, X-Face
+@subsubsection x-face-xmas (XEmacs \e$B$N>l9g\e(B)
+@pindex x-face-xmas
+
+x-face (@uref{ftp://jpl.org/pub/elisp/}) 1.3.6.13 \e$B0J9_$KIUB0$N\e(B
+@file{x-face-xmas.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-function
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule:x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-xmas-wl-display-x-face "x-face")
+(setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face)
 @end group
 @end lisp
 
-x-face-mule 0.20 \e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-mule, x-face-e21, x-face-xmas, X-Face
+@subsubsection x-face-mule (Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B)
+@pindex x-face-mule
+@pindex bitmap-mule
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0\e$B0J9_$K\e(B
+\e$BIUB0$N\e(B @file{x-face-mule.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-function
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule-x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-decode-message-header "x-face-mule")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
-\e$B$r$*;H$$$K$J$k>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-e21,  , x-face-mule, X-Face
+@subsubsection x-face-e21 (Emacs 21.x \e$B$N>l9g\e(B)
+@pindex x-face-e21
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) \e$B$H\e(B
+@file{x-face-e21.el} (@uref{ftp://jpl.org/pub/elisp/}) \e$B$r;H$&>l9g$O0J2<$N\e(B
+\e$B$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(autoload 'x-face-decode-message-header "x-face-mule")
+(require 'bitmap)
+(autoload 'x-face-decode-message-header "x-face-e21")
 (setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-\e$B%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
-(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
-\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
-(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
-
 
-@node dired-dd, MHC, x-face-mule, Living with other packages
+@node dired-dd, MHC, X-Face, Living with other packages
 @subsection dired-dd(Dired-DragDrop)
 @pindex Dired-DragDrop
 @pindex Dired-DD

diff --git a/doc/wl.texi b/doc/wl.texi
index 501d701..37b693d 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -5994,7 +5994,7 @@ Examples with other packages.
 * BBDB::                        BBDB
 * supercite::                   supercite.el
 * mu-cite::                     mu-cite.el
-* x-face-mule::                 x-face-mule.el
+* X-Face::                      x-face,bitmap-mule
 * dired-dd::                    dired-dd.el
 * MHC::                         MHC
 @end menu
@@ -6070,7 +6070,7 @@ example of settings:
 @end lisp
 
 
-@node mu-cite, x-face-mule, supercite, Living with other packages
+@node mu-cite, X-Face, supercite, Living with other packages
 @subsection mu-cite.el
 @pindex mu-cite
 
@@ -6095,53 +6095,71 @@ If you use mu-cite version 8.1 or later:
 @end group
 @end lisp
 
-@node x-face-mule, dired-dd, mu-cite, Living with other packages
-@subsection x-face-mule.el
-@pindex x-face-mule
-@pindex bitmap-mule
+@node X-Face, dired-dd, mu-cite, Living with other packages
+@subsection x-face
+@pindex x-face
+
+If you have installed one of the following, you can decode
+@samp{X-Face:} field in message buffer and you will see face image.
+
+@menu
+* x-face-xmas::                       XEmacs case
+* x-face-mule::                       Emacs 19.34, 20.x case
+* x-face-e21::                        Emacs 21.x case
+@end menu
+
+If there is an encoded X-Face string in a file @file{~/.xface} (the
+value of the variable @code{wl-x-face-file}), it is inserted as a
+@samp{X-Face:} field in the draft buffer (if
+@code{wl-auto-insert-x-face} is non-nil).
 
-It depends on the version of x-face-mule.
-If you use x-face-mule 0.19 or older, do the following:
+@node x-face-xmas, x-face-mule, X-Face, X-Face
+@subsubsection x-face-xmas (for XEmacs)
+@pindex x-face-xmas
+
+If you use @file{x-face-xmas.el} in x-face (@uref{ftp://jpl.org/pub/elisp/})
+1.3.6.13 or later, do the following:
 
 @lisp
 @group
-(setq wl-highlight-x-face-function
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule:x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-xmas-wl-display-x-face "x-face")
+(setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face)
 @end group
 @end lisp
 
-If you use x-face-mule 0.20 or later, try the following:
+@node x-face-mule, x-face-e21, x-face-xmas, X-Face
+@subsubsection x-face-mule (for Emacs 19.34, 20.x)
+@pindex x-face-mule
+@pindex bitmap-mule
+
+If you use @file{x-face-mule.el} in bitmap-mule
+(@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0 or later, do the following:
 
 @lisp
 @group
-(setq wl-highlight-x-face-function
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule-x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-decode-message-header "x-face-mule")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-Use these settings when you use @file{x-face-mule.el} attached to
-bitmap-mule 8.0 or later:
+@node x-face-e21,  , x-face-mule, X-Face
+@subsubsection x-face-e21 (for Emacs 21.x)
+@pindex x-face-e21
+
+If you use @file{x-face-e21.el} (@uref{ftp://jpl.org/pub/elisp/})
+with bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}),
+do the following:
 
 @lisp
 @group
-(autoload 'x-face-decode-message-header "x-face-mule")
+(require 'bitmap)
+(autoload 'x-face-decode-message-header "x-face-e21")
 (setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-If there is an encoded X-Face string in a file @file{~/.xface} (the
-value of the variable @code{wl-x-face-file}), it is inserted as a
-@samp{X-Face:} field in the draft buffer (if
-@code{wl-auto-insert-x-face} is non-nil).
-
 
-@node dired-dd, MHC, x-face-mule, Living with other packages
+@node dired-dd, MHC, X-Face, Living with other packages
 @subsection dired-dd(Dired-DragDrop)
 @pindex Dired-DragDrop
 @pindex Dired-DD