From: yoichi <yoichi>
Date: Tue, 11 Dec 2001 14:59:49 +0000 (+0000)
Subject: With emacs 21.1, we can use x-face-mule or x-face-e21.
X-Git-Tag: wl-2_8-root~34
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e0332e428f2d1f8058b055f92fac565883db7f;p=elisp%2Fwanderlust.git

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
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -6121,8 +6121,7 @@ mu-cite 8.1以降のバージョンをお使いなら、
 
 @menu
 * x-face-xmas::                       XEmacs の場合
-* x-face-mule::                       Emacs 19.34、20.x の場合
-* x-face-e21::                        Emacs 21.x の場合
+* x-face-mule::                       Emacs の場合
 @end menu
 
 また、エンコード済みの X-Face 文字列を @file{~/.xface}
@@ -6145,8 +6144,8 @@ x-face (@uref{ftp://jpl.org/pub/elisp/}) 1.3.6.13 以降に付属の
 @end group
 @end lisp
 
-@node x-face-mule, x-face-e21, x-face-xmas, X-Face
-@subsubsection x-face-mule (Emacs 19.34、20.x の場合)
+@node x-face-mule,  , x-face-xmas, X-Face
+@subsubsection x-face-mule (Emacs の場合)
 @pindex x-face-mule
 @pindex bitmap-mule
 
@@ -6160,12 +6159,12 @@ bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0以降に
 @end group
 @end lisp
 
-@node x-face-e21,  , x-face-mule, X-Face
 @subsubsection x-face-e21 (Emacs 21.x の場合)
 @pindex x-face-e21
 
-@file{x-face-e21.el} (@uref{ftp://jpl.org/pub/elisp/}) を使う場合は以下の
-ように設定してください。
+Emacs 21.x の場合には、@file{x-face-mule.el} の代わりに @file{x-face-e21.el}
+(@uref{ftp://jpl.org/pub/elisp/}) を使って X-Face を表示することもできます。
+その場合、bitmap-mule は不要です。以下のように設定してください。
 
 @lisp
 @group
diff --git a/doc/wl.texi b/doc/wl.texi
index bcac64c..3d8a5f3 100644
--- 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