Synch to No Gnus 200604060839.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f745a28..7690202 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-fun.el (gnus-face-properties-alist): Add :version.
+
 2006-04-05  Daiki Ueno  <ueno@unixuser.org>
 
        * pgg-gpg.el (pgg-gpg-process-filter): Fix.

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index c9fd88d..0923ad6 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -98,6 +98,7 @@ See the manual for the valid properties for various image types.
 Currently, `pbm' is used for X-Face images and `png' is used for Face
 images in Emacs.  Only the `:face' property is effective on the `xface'
 image type in XEmacs if it is built with the libcompface library."
+  :version "23.0" ;; No Gnus
   :group 'gnus-fun
   :type '(repeat (cons :format "%v" (symbol :tag "Image type") plist)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index e149057..64f6803 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Face): Restore XREF to gnus-face-properties-alist;
+       fix typo.
+
 2006-04-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (X-Face): Clarify.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index c669638..2f0676c 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -22133,6 +22133,9 @@ Lisp Reference Manual}, \e$B$r;2>H$7$F2<$5$$!#:#$N$H$3$m\e(B Emacs \e$B$G\e(B
 \e$B$l$P$J$j$^$;$s!#@53N$J;EMM$K$D$$$F!"\e(B
 @uref{http://quimby.gnus.org/circus/face/} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
+\e$BJQ?t\e(B @code{gnus-face-properties-alist} \e$B$OI=<($5$l$k\e(B Face \e$B2hA|$N304Q$K1F\e(B
+\e$B6A$7$^$9!#\e(B@xref{X-Face}.
+
 @code{Face} \e$B%X%C%@!<$r8+$k$K$O\e(B Emacs \e$B$,\e(B PNG \e$B2hA|$rI=<($G$-$kI,MW$,$"$j$^\e(B
 \e$B$9!#\e(B
 @c Maybe add this:

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 26c7257..21e5043 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22704,11 +22704,14 @@ The contents of a @code{Face} header must be a base64 encoded PNG image.
 See @uref{http://quimby.gnus.org/circus/face/} for the precise
 specifications.
 
-Viewing an @code{X-Face} header either an Emacs that is able to display
+The @code{gnus-face-properties-alist} variable affects the appearance of
+displayed Face images.  @xref{X-Face}.
+
+Viewing an @code{Face} header requires an Emacs that is able to display
 PNG images.
 @c Maybe add this:
 @c (if (featurep 'xemacs)
-@c     (featurep 'pgn)
+@c     (featurep 'png)
 @c   (image-type-available-p 'png))
 
 Gnus provides a few convenience functions and variables to allow