Synch with Oort Gnus.

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 813479b..87c4801 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -28,8 +28,9 @@ default.  See the variables `message-required-headers',
 Message now asks if you wish to remove "(was: <old subject>)" from
 subject lines (see `message-subject-trailing-was-query').  C-c M-m and
 C-c M-f inserts markers indicating included text.  C-c C-f a adds a
-X-No-Archive: header.  Improved crosspost follow behaviour with
-`message-cross-post-*'.
+X-No-Archive: header.  C-c C-f x inserts appropriate headers and a
+note in the body for cross-postings and followups (see the variables
+`message-cross-post-*').
 
 ** References and X-Draft-Headers are no longer generated when you
    start composing messages.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 4fbffa7..d6cec46 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-15  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (X-Face): Revert substantial part of last fix.
+
 2003-01-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Window Layout): Fixed braces in example.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7e205f3..8f32d9e 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -20526,13 +20526,13 @@ gnus \e$B$O!"30$K=P$9%a%C%;!<%8$K\e(B X-Face \e$B%X%C%@!<$r4JC1$KA^F~$9$k$?$a$N!"JX
 \e$B%7%'%k%3%^%s%I\e(B @code{gnus-convert-image-to-x-face-command} \e$B$r;H$C$F$=$N\e(B
 \e$B%U%!%$%k$r\e(B X-Face \e$B$N7A<0$KJQ49$7$^$9!#\e(B
 
-\e$BFsHVL\$O0lHLE*$K;H$&$G$"$m$&4X?t$G$9!#0J2<$N$h$&$J$b$N\e(B
+\e$B0lHVL\$O0lHLE*$K;H$&$G$"$m$&4X?t$G$9!#0J2<$N$h$&$J$b$N\e(B
 \e$B$r\e(B @file{.gnus.el} \e$B%U%!%$%k$K=q$$$F2<$5$$\e(B:
 
 @lisp
 (setq message-required-news-headers
       (nconc message-required-news-headers
-             (list '(X-Face . gnus-insert-random-x-face-header))))
+             (list '(X-Face . gnus-random-x-face))))
 @end lisp
 
 \e$B:G8e$N4X?t$r;H$&$N$O!"$3$N$h$&$K$J$k$G$7$g$&\e(B:

diff --git a/texi/gnus.texi b/texi/gnus.texi
index dc351a8..189bfa4 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -20999,13 +20999,13 @@ randomly generated data.
 converts the file to X-Face format by using the
 @code{gnus-convert-image-to-x-face-command} shell command.
 
-Here's how you would typically use the second function.  Put something
+Here's how you would typically use the first function.  Put something
 like the following in your @file{.gnus.el} file:
 
 @lisp
 (setq message-required-news-headers
       (nconc message-required-news-headers
-             (list '(X-Face . gnus-insert-random-x-face-header))))
+             (list '(X-Face . gnus-random-x-face))))
 @end lisp
 
 Using the last function would be something like this: