With emacs 21.1, we can use x-face-mule or x-face-e21.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index a5666fa..5bb835d 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -6121,8 +6121,7 @@ mu-cite 8.1\e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\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
+* x-face-mule::                       Emacs \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}
@@ -6145,8 +6144,8 @@ x-face (@uref{ftp://jpl.org/pub/elisp/}) 1.3.6.13 \e$B0J9_$KIUB0$N\e(B
 @end group
 @end lisp
 
-@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)
+@node x-face-mule,  , x-face-xmas, X-Face
+@subsubsection x-face-mule (Emacs \e$B$N>l9g\e(B)
 @pindex x-face-mule
 @pindex bitmap-mule
 
@@ -6160,12 +6159,12 @@ bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0\e$B0J9_$K\e(B
 @end group
 @end lisp
 
-@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
 
-@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
+Emacs 21.x \e$B$N>l9g$K$O!"\e(B@file{x-face-mule.el} \e$B$NBe$o$j$K\e(B @file{x-face-e21.el}
+(@uref{ftp://jpl.org/pub/elisp/}) \e$B$r;H$C$F\e(B X-Face \e$B$rI=<($9$k$3$H$b$G$-$^$9!#\e(B
+\e$B$=$N>l9g!"\e(Bbitmap-mule \e$B$OITMW$G$9!#0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group

diff --git a/doc/wl.texi b/doc/wl.texi
index bcac64c..3d8a5f3 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -6210,8 +6210,7 @@ If you have installed one of the following, you can decode
 
 @menu
 * x-face-xmas::                       XEmacs case
-* x-face-mule::                       Emacs 19.34, 20.x case
-* x-face-e21::                        Emacs 21.x case
+* x-face-mule::                       Emacs case
 @end menu
 
 If there is an encoded X-Face string in a file @file{~/.xface} (the
@@ -6233,8 +6232,8 @@ If you use @file{x-face-xmas.el} in x-face (@uref{ftp://jpl.org/pub/elisp/})
 @end group
 @end lisp
 
-@node x-face-mule, x-face-e21, x-face-xmas, X-Face
-@subsubsection x-face-mule (for Emacs 19.34, 20.x)
+@node x-face-mule,  , x-face-xmas, X-Face
+@subsubsection x-face-mule (for Emacs)
 @pindex x-face-mule
 @pindex bitmap-mule
 
@@ -6248,12 +6247,13 @@ If you use @file{x-face-mule.el} in bitmap-mule
 @end group
 @end lisp
 
-@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/}),
-do the following:
+With Emacs 21.x, you can use @file{x-face-e21.el}
+(@uref{ftp://jpl.org/pub/elisp/}) instead of @file{x-face-mule.el}
+to display X-Face. In this case, bitmap-mule is not required.
+Do as follows:
 
 @lisp
 @group