From: yamaoka <yamaoka>
Date: Wed, 8 Jan 2003 23:05:15 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_12-00-quimby~24
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c488c04ab9e40948d6e5d15099fbf2ff0322c0;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a1791e..c1b9c6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2003-01-08  Jesper Harder  <harder@ifa.au.dk>
+
+	* message.el (message-mode-field-menu): Use backquote.
+
+2003-01-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el: fixed the BBDB autoloads again, using
+	bbdb-search-simple now (which is not a macro, thank god)
+
+	* lpath.el (bbdb-search): removed function from maybe-fbind list
+
+	* gnus.el (ham-process-destination): added new parameter for
+	destination of ham articles found in spam groups at summary exit
+
+	* spam.el (spam-get-ifile-database-parameter): use spam-ifile-database-path
+	(spam-check-ifile, spam-ifile-register-with-ifile): use spam-get-ifile-database-parameter
+	(spam-ifile-database-path): added new parameter for ifile's database
+	(spam-move-spam-nonspam-groups-only): new parameter to determine
+	if spam should be moved from all groups or only some
+	(spam-summary-prepare-exit): fixed logic to use
+	spam-move-spam-nonspam-groups-only when deciding to invoke
+	spam-mark-spam-as-expired-and-move-routine; always invoke that
+	routine after the spam has been expired-or-moved in case there's
+	some spam left over; use spam-ham-move-routine in spam groups
+	(spam-ham-move-routine): new function to move ham articles to the
+	ham-process-destinations group parameter
+
+2003-01-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-spec.el (gnus-parse-complex-format): %~ => ~*.
+
+	* gnus-agent.el (gnus-agent-fetch-selected-article): Use
+	gnus-summary-update-article-line. 
+
 2003-01-08  Simon Josefsson  <jas@extundo.com>
 
 	* nnmail.el (nnmail-expiry-target-group): Request group, create it
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index fbad4c6..e7cc6ea 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -849,7 +849,9 @@ This can be added to `gnus-select-article-hook' or
 	     (list gnus-current-article))
 	(setq gnus-newsgroup-undownloaded
 	      (delq gnus-current-article gnus-newsgroup-undownloaded))
-	(gnus-summary-update-line gnus-current-article)))))
+	(gnus-summary-update-article-line
+	 gnus-current-article
+	 (gnus-summary-article-header gnus-current-article))))))
 
 ;;;
 ;;; Internal functions
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 032d883..93655c2 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,5 +1,31 @@
 2003-01-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus.texi (Positioning Point): %~ => ~*.
+
+2003-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* message.texi: Updated copyright line.
+	(Mailing Lists): Updated (renamed) function names.
+	(Header Commands): Updated (renamed) function names.
+	(Header Commands): Added message-to-list-only,
+	message-change-subject, message-cross-post-followup-to,
+	message-reduce-to-to-cc and message-add-archive-header.  Moved
+	message-sort-headers, message-insert-to, message-insert-newsgroups
+	and message-insert-disposition-notification-to from other
+	sections.
+	(Insertion): Added message-mark-inserted-region,
+	message-mark-insert-file.  Moved
+	message-insert-disposition-notification-to to section (Header
+	Commands).
+	(Various Commands): Moved message-insert-wide-reply,
+	message-insert-to, message-insert-newsgroups and
+	message-sort-headers to (Header Commands) section.
+	(Message Headers): Added message-subject-trailing-was-query.
+	(Insertion Variables): Added message-mark-insert-begin and
+	message-mark-insert-end.
+
+2003-01-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
 	* gnus.texi (Optional Back End Functions): Addition.
 	(Positioning Point): Changed to %~.
 
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 251bab4..57ada83 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -19207,8 +19207,8 @@ gnus $B$ODL>o$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
 $B$-$^$9!#$=$N4X?t$O(B @code{gnus-goto-colon} $B$H8F$P$l$F$$$^$9!#(B
 
 $B$G$b!"$b$7$"$J$?$,9T$K%3%m%s$r4^$a$?$/$J$$$J$i$P!"$3$l$r07$&$?$a$N$*$=$i(B
-$B$/:G$b<j$4$m$JJ}K!$O(B @samp{%~} $B;X<(;R$r;H$&$3$H$G$9!#$"$J$?$N9T$N=qK!;E(B
-$BMM$NDj5A$K(B @samp{%~} $B$rF~$l$F$*$1$P!"(Bgnus $B$O$=$3$K%]%$%s%H$rCV$-$^$9!#(B
+$B$/:G$b<j$4$m$JJ}K!$O(B @samp{%*} $B;X<(;R$r;H$&$3$H$G$9!#$"$J$?$N9T$N=qK!;E(B
+$BMM$NDj5A$K(B @samp{%*} $B$rF~$l$F$*$1$P!"(Bgnus $B$O$=$3$K%]%$%s%H$rCV$-$^$9!#(B
 
 @node Tabulation
 @subsection $B@0Ns(B
diff --git a/texi/gnus.texi b/texi/gnus.texi
index f607b0d..ccc8432 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -19617,8 +19617,8 @@ You can redefine the function that moves the point to the colon.  The
 function is called @code{gnus-goto-colon}.
 
 But perhaps the most convenient way to deal with this, if you don't want
-to have a colon in your line, is to use the @samp{%~} specifier.  If you
-put a @samp{%~} somewhere in your format line definition, Gnus will
+to have a colon in your line, is to use the @samp{%*} specifier.  If you
+put a @samp{%*} somewhere in your format line definition, Gnus will
 place point there.
 
 
diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 7ca8b3d..3f5ce6b 100644
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -22,7 +22,8 @@ This file documents Message, the Emacs message composition mode.
 $B$3$N%U%!%$%k$O(B Emacs $B$N%a%C%;!<%8:n@.%b!<%I$G$"$k(B Message $B$K4X$9$k@bL@J8(B
 $B=q$G$9!#(B
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 
+Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -69,7 +70,7 @@ license to the document, as described in section 6 of the license.
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
      Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -460,7 +461,7 @@ gnus $B$K$O$3$NJQ?t$N9%E,$J8uJd$G$"$k$H$3$m$N!"$"$i$+$8$aDj5A$5$l$F$$$k4X(B
 $B@_Dj$5$l$^$9!#(B
 
 @kindex C-c C-f C-a
-@findex message-gen-unsubscribed-mft
+@findex message-generate-unsubscribed-mail-followup-to
 @kindex C-c C-f C-m
 @findex message-goto-mail-followup-to
 $B$&!<$`!#$=$&$9$k$H$"$J$?$O!V9XFI$7$F$$$J$$%a!<%j%s%0%j%9%H$K%a!<%k$rAw?.(B
@@ -468,9 +469,10 @@ gnus $B$K$O$3$NJQ?t$N9%E,$J8uJd$G$"$k$H$3$m$N!"$"$i$+$8$aDj5A$5$l$F$$$k4X(B
 $B?R$M$^$9$M(B ($B$?$V$sB>$N?M$O(B MFT $B$,L5$+$C$?>l9g$HF1MM$K=hM}$7$F$7$^$&$@$m(B
 $B$&$1$l$I!"C/$+$N(B to-address $B%0%k!<%W%Q%i%a!<%?$r>e=q$-$9$k$?$a$K!"L@<(E*(B
 $B$J(B MFT $B$r;H$&$3$H$,$G$-$k$N$G$9(B)$B!#4X(B
-$B?t(B @code{message-gen-unsubscribed-mft} $B$,Lr$KN)$D$3$H$,$"$k$G$7$g$&!#$3(B
-$B$l$O%G%#%U%)%k%H$G(B @kbd{C-c C-f C-a} $B$K3d$jEv$F$i$l$F$$$^$9!#$I$s$J>l9g(B
-$B$G$b!"$"$J$?$O<+J,$,A*$s$@(B MFT $B$rA^F~$9$k$3$H$,$G$-$^$9(B; $B$=$l$r;O$a$k$N(B
+$B?t(B @code{message-generate-unsubscribed-mail-followup-to} $B$,Lr$KN)$D$3$H(B
+$B$,$"$k$G$7$g$&!#$3$l$O%G%#%U%)%k%H$G(B @kbd{C-c C-f C-a} $B$K3d$jEv$F$i$l$F(B
+$B$$$^$9!#$I$s$J>l9g$G$b!"$"$J$?$O<+J,$,A*$s$@(B MFT $B$rA^F~$9$k$3$H$,$G$-$^(B
+$B$9(B; $B$=$l$r;O$a$k$N(B
 $B$K(B @kbd{C-c C-f C-m} (@code{message-goto-mail-followup-to}) $B$,=u$1$F$/$l(B
 $B$k$G$7$g$&!#(B
 
@@ -504,7 +506,7 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (nettiquette) $B$G$"$k$H9M$($i$l$F$$$^
 
 @menu
 * Buffer Entry::        $B%a%C%;!<%8%P%C%U%!$KF~$C$?8e$NL?Na(B
-* Header Commands::     $B%X%C%@!<$K0\F0$9$k$?$a$NL?Na(B
+* Header Commands::     $B%X%C%@!<$K0\F0$^$?$O%X%C%@!<$rJQ99$9$k$?$a$NL?Na(B
 * Movement::            $B%a%C%;!<%8%P%C%U%!$rF0$-2s$k(B
 * Insertion::           $B%a%C%;!<%8%P%C%U%!$KJ*;v$rA^F~$9$k(B
 @c * MIME::                @sc{mime} considerations.
@@ -530,9 +532,9 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (nettiquette) $B$G$"$k$H9M$($i$l$F$$$^
 
 @node Header Commands
 @section $B%X%C%@!<L?Na(B
+@subsection $B%X%C%@!<$K0\F0$9$k$?$a$NL?Na(B
 
-$B$3$l$i$NA4$F$NL?Na$OEv$N%X%C%@!<$K0\F0$7$^$9(B (@samp{Importance:} $B7O$N%3(B
-$B%^%s%I$ONc30(B)$B!#$b$7$=$l$,B8:_$7$J$$$H!"$=$l$OA^F~$5$l$^$9!#(B
+$B0J2<$NL?Na$OEv$N%X%C%@!<$K0\F0$7$^$9!#B8:_$7$J$1$l$PA^F~$5$l$^$9!#(B
 
 @table @kbd
 
@@ -610,17 +612,119 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (nettiquette) $B$G$"$k$H9M$($i$l$F$$$^
 $B$7%P%C%U%!$K$9$G$K$3$N%X%C%@!<$,$"$k>l9g$O!"(BRFC 1376 $B$K=`$8$?;0$D$N(B
 $BCM(B @samp{low}$B!"(B@samp{normal} $B$*$h$S(B @samp{high} $B$r=[4D$5$;$^$9!#(B
 
+@c TRANSLATEME!
+@item C-c C-f C-a
+@kindex C-c C-f C-a
+@findex message-generate-unsubscribed-mail-followup-to
+Insert a reasonable @samp{Mail-Followup-To:} header
+(@pxref{Mailing Lists}) in a post to an
+unsubscribed list.  When making original posts to a mailing list you are
+not subscribed to, you have to type in a @samp{Mail-Followup-To:} header
+by hand.  The contents, usually, are the addresses of the list and your
+own address.  This function inserts such a header automatically.  It
+fetches the contents of the @samp{To:} header in the current mail
+buffer, and appends the current @code{user-mail-address}.
+
+If the optional argument @code{include-cc} is non-nil, the addresses in
+the @samp{Cc:} header are also put into the @samp{Mail-Followup-To:}
+header.
+
+@end table
+
+@subsection  Commands to change headers
+
+@table @kbd
+
+@item C-c C-o
+@kindex C-c C-o
+@findex message-sort-headers
+@vindex message-header-format-alist
+Sort headers according to @code{message-header-format-alist}
+(@code{message-sort-headers}).
+
+@item C-c C-t
+@kindex C-c C-t
+@findex message-insert-to
+Insert a @code{To} header that contains the @code{Reply-To} or
+@code{From} header of the message you're following up
+(@code{message-insert-to}).
+
+@item C-c C-n
+@kindex C-c C-n
+@findex message-insert-newsgroups
+Insert a @code{Newsgroups} header that reflects the @code{Followup-To}
+or @code{Newsgroups} header of the article you're replying to
+(@code{message-insert-newsgroups}).
+
+@item C-c C-l
+@kindex C-c C-l
+@findex message-to-list-only
+Send a message to the list only.  Remove all addresses but the list
+address from @code{To:} and @code{Cc:} headers.
+
+@item C-c M-n
+@kindex C-c M-n
+@findex message-insert-disposition-notification-to
+Insert a request for a disposition
+notification. (@code{message-insert-disposition-notification-to}).
+This means that if the recipient support RFC 2298 she might send you a
+notification that she received the message.
+
 @item M-x message-insert-importance-high
 @kindex M-x message-insert-importance-high
 @findex message-insert-importance-high
+@cindex Importance
 $BCM(B @samp{high} $B$r;}$D(B @samp{Importance:} $B%X%C%@!<$rA^F~$7$^$9!#I,MW$J(B
 $B$i(B ($B$9$G$K$"$k(B) $B%X%C%@!<$r>C5n$7$F$+$i!#(B
 
+@c TRANSLATEME!
 @item M-x message-insert-importance-low
 @kindex M-x message-insert-importance-low
 @findex message-insert-importance-low
-$BCM(B @samp{low} $B$r;}$D(B @samp{Importance:} $B%X%C%@!<$rA^F~$7$^$9!#I,MW$J(B
-$B$i(B ($B$9$G$K$"$k(B) $B%X%C%@!<$r>C5n$7$F$+$i!#(B
+@cindex Importance
+Insert an @samp{Importance:} header with a value of @samp{low}, deleting
+headers if necessary.
+
+@item C-c C-f s
+@kindex C-c C-f s
+@findex message-change-subject
+@cindex Subject
+Change the current @samp{Subject:} header.  Ask for new @samp{Subject:}
+header and append @code{(was: <Old Subject>)}.  The old subject can be
+stripped on replying, see @code{message-subject-trailing-was-query}
+(@pxref{Message Headers}).
+
+@item C-c C-f x
+@kindex C-c C-f x
+@findex message-cross-post-followup-to
+@vindex message-cross-post-default
+@cindex X-Post
+@cindex cross-post
+Ask for an additional @samp{Newsgroups:} and @samp{FollowUp-To:} for a
+cross-post.  @code{message-cross-post-followup-to} mangles
+@samp{FollowUp-To:} and @samp{Newsgroups:} header to point to group.
+If @code{message-cross-post-default} is @code{nil} or if called with a
+prefix-argument @samp{Follow-Up:} is set, but the message is not
+cross-posted.
+
+@item C-c C-f t
+@kindex C-c C-f t
+@findex message-reduce-to-to-cc
+Replace contents of @samp{To:} header with contents of @samp{Cc:} or
+@samp{Bcc:} header.
+
+@item C-c C-f a
+@kindex C-c C-f a
+@findex message-add-archive-header
+@vindex message-archive-header
+@vindex message-archive-note
+@cindex X-No-Archive
+Insert @samp{X-No-Archive: Yes} in the header and a note in the body.
+The header and the note can be customized using
+@code{message-archive-header} and @code{message-archive-note}.  When
+called with a prefix argument, ask for a text to insert.  If you don't
+want the note in the body, set @code{message-archive-note} to
+@code{nil}.
 @end table
 
 @node Movement
@@ -685,13 +789,18 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (nettiquette) $B$G$"$k$H9M$($i$l$F$$$^
 @findex message-insert-headers
 $B%a%C%;!<%8$N%X%C%@!<$rA^F~$7$^$9(B (@code{message-insert-headers})$B!#(B
 
-@item C-c M-n
-@kindex C-c M-n
-@findex message-insert-disposition-notification-to
-$B3+Iu3NG'MW5a$rA^F~$7$^$9!#(B
-(@code{message-insert-disposition-notification-to})$B!#$3$l$O!"$b$7<u?.<T(B
-$B$,(B RFC 2298 $B$r%5%]!<%H$7$F$$$?$i!"H`=w$K$=$N%a%C%;!<%8$r<u$1<h$C$?$3$H$r(B
-$BCN$i$;$FM_$7$$$3$H$r0UL#$7$^$9!#(B
+@c TRANSLATEME!
+@item C-c M-m
+@kindex C-c M-m
+@findex message-mark-inserted-region
+Mark some region in the current article with enclosing tags.
+See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+
+@item C-c M-f
+@kindex C-c M-f
+@findex message-mark-insert-file
+Insert a file in the current article with enclosing tags.
+See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
 @end table
 
 @c FIXTGNUS We should provide MIME manual.
@@ -959,36 +1068,6 @@ documentation of your OpenPGP implementation, so we refer to it.
 
 @samp{*} $B$O%]%$%s%H$,CV$+$l$F$$$k>l=j$G$9!#(B
 
-@item C-c C-t
-@kindex C-c C-t
-@findex message-insert-to
-$B%U%)%m!<%"%C%W$7$h$&$H$9$k%a%C%;!<%8$N(B @code{Reply-To} $B$b$7$/(B
-$B$O(B @code{From} $B%X%C%@!<$r4^$`(B @code{To} $B%X%C%@!<$rA^F~$7$^(B
-$B$9(B (@code{message-insert-to})$B!#(B
-
-@item C-c M-t
-@kindex C-c M-t
-@findex message-insert-wide-reply
-$BK\5-;v$KBP$7$F9-$$JVEz$r$7$?$H$-$N$h$&$J%"%I%l%9$r4^(B
-$B$`(B @code{To} $B$H(B @code{Cc} $B%X%C%@!<$rA^F~$7$^(B
-$B$9(B (@code{message-insert-wide-reply})$B!#$3$l$O!"IaDL$O(B @code{To},
-@code{From}/@code{Reply-To} $B$*$h$S(B @code{Cc} $B$+$i!"$9$Y$F$N%"%I%l%9$,=&(B
-$B$$>e$2$i$l$k$3$H$r0UL#$7$^$9!#(B
-
-@item C-c C-n
-@kindex C-c C-n
-@findex message-insert-newsgroups
-$BJVEz$7$F$$$k5-;v$N(B @code{Followup-To} $B$b$7$/$O!"(B@code{Nesgroups} $B%X%C%@!<(B
-$B$rH?1G$7$?(B @code{Newsgroups} $B%X%C%@!<$rA^F~$7$^(B
-$B$9(B (@code{message-insert-newsgroups})$B!#(B
-
-@item C-c C-o
-@kindex C-c C-o
-@findex message-sort-headers
-@vindex message-header-format-alist
-@code{message-header-format-alist} $B$K=>$C$F%X%C%@!<$rJB$YBX$($^(B
-$B$9(B (@code{message-sort-headers})$B!#(B
-
 @item C-c M-r
 @kindex C-c M-r
 @findex message-rename-buffer
@@ -1225,6 +1304,19 @@ Message $B$,(B gnus $B>e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!$O%I%i%U%H%0%k!<%
      "^\\(\\(\\([Rr][Ee]\\|[Ss][Vv]\\|[Aa][Ww]\\): *\\)+\\)")
 @end lisp
 
+@c TRANSLATEME!
+@item message-subject-trailing-was-query
+@vindex message-subject-trailing-was-query
+@vindex message-subject-trailing-was-ask-regexp
+@vindex message-subject-trailing-was-regexp
+Controls what to do with trailing @samp{(was: <old subject>)} in subject
+lines.  If @code{nil}, leave the subject unchanged.  If it is the symbol
+@code{ask}, query the user what do do.  In this case, the subject is
+matched against @code{message-subject-trailing-was-ask-regexp}.  If
+@code{message-subject-trailing-was-query} is t, always strip the
+trailing old subject.  In this case,
+@code{message-subject-trailing-was-regexp} is used.
+
 @item message-alternative-emails
 @vindex message-alternative-emails
 $BBe$o$j$N%a!<%k%"%I%l%9$K9gCW$9$k@55,I=8=$G$9!#:G=i$K%^%C%A$7$?(B ($BBh0l5A$G(B
@@ -1625,6 +1717,15 @@ Hallvard B Furuseth <h.b.furuseth@@usit.uio.no> writes:
 $B$=$7$F!"$=$l$>$l$N4X?t$O0zMQJ8$,=$@5$5$l$k$H!"$=$N<~$j$K%]%$%s%H$H%^!<%/(B
 $B$r;D$5$J$1$l$P$J$j$^$;$s!#(B
 
+@c TRANSLATEME!
+@item message-mark-insert-begin
+@vindex message-mark-insert-begin
+String to mark the beginning of some inserted text.
+
+@item message-mark-insert-end
+@vindex message-mark-insert-end
+String to mark the end of some inserted text.
+
 @item message-signature
 @vindex message-signature
 $B%a%C%;!<%8%P%C%U%!$N:G8e$KA^F~$5$l$kJ8;zNs$G$9!#$b$7(B @code{t} ($B$3$l$,=i(B
diff --git a/texi/message.texi b/texi/message.texi
index 9b72f89..aeb2cac 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -18,7 +18,8 @@
 
 This file documents Message, the Emacs message composition mode.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 
+Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -438,17 +439,17 @@ address, then no MFT is generated; otherwise, a MFT is added to the
 other headers and set to the value of all addresses in To: and Cc:
 
 @kindex C-c C-f C-a
-@findex message-gen-unsubscribed-mft
+@findex message-generate-unsubscribed-mail-followup-to
 @kindex C-c C-f C-m
 @findex message-goto-mail-followup-to
 Hm. ``So'', you ask, ``what if I send an email to a list I am not
-subscribed to?  I want my MFT to say that I want an extra copy.''
-(This is supposed to be interpreted by others the same way as if there
-were no MFT, but you can use an explicit MFT to override someone
-else's to-address group parameter.)  The function
-@code{message-gen-unsubscribed-mft} might come in handy.  It is bound
-to @kbd{C-c C-f C-a} by default.  In any case, you can insert a MFT of
-your own choice; @kbd{C-c C-f C-m}
+subscribed to?  I want my MFT to say that I want an extra copy.''  (This
+is supposed to be interpreted by others the same way as if there were no
+MFT, but you can use an explicit MFT to override someone else's
+to-address group parameter.)  The function
+@code{message-generate-unsubscribed-mail-followup-to} might come in
+handy.  It is bound to @kbd{C-c C-f C-a} by default.  In any case, you
+can insert a MFT of your own choice; @kbd{C-c C-f C-m}
 (@code{message-goto-mail-followup-to}) will help you get started.
 
 @c @node Honoring an MFT post
@@ -481,7 +482,7 @@ better than you do.
 
 @menu
 * Buffer Entry::        Commands after entering a Message buffer.
-* Header Commands::     Commands for moving to headers.
+* Header Commands::     Commands for moving headers or changing headers.
 * Movement::            Moving around in message buffers.
 * Insertion::           Inserting things into message buffers.
 * MIME::                @sc{mime} considerations.
@@ -511,9 +512,10 @@ times, you will get back the un-edited message you're responding to.
 @node Header Commands
 @section Header Commands
 
-All these commands move to the header in question (except for the
-@samp{Importance:} related commands).  If it doesn't exist, it will be
-inserted.
+@subsection Commands for moving to headers
+
+These following commands move to the header in question.  If it doesn't
+exist, it will be inserted.
 
 @table @kbd
 
@@ -592,17 +594,117 @@ message to the receiver.  If the header is already present in the
 buffer, it cycles between the three valid values according to RFC
 1376: @samp{low}, @samp{normal} and @samp{high}.
 
+@item C-c C-f C-a
+@kindex C-c C-f C-a
+@findex message-generate-unsubscribed-mail-followup-to
+Insert a reasonable @samp{Mail-Followup-To:} header
+(@pxref{Mailing Lists}) in a post to an
+unsubscribed list.  When making original posts to a mailing list you are
+not subscribed to, you have to type in a @samp{Mail-Followup-To:} header
+by hand.  The contents, usually, are the addresses of the list and your
+own address.  This function inserts such a header automatically.  It
+fetches the contents of the @samp{To:} header in the current mail
+buffer, and appends the current @code{user-mail-address}.
+
+If the optional argument @code{include-cc} is non-nil, the addresses in
+the @samp{Cc:} header are also put into the @samp{Mail-Followup-To:}
+header.
+
+@end table
+
+@subsection  Commands to change headers
+
+@table @kbd
+
+@item C-c C-o
+@kindex C-c C-o
+@findex message-sort-headers
+@vindex message-header-format-alist
+Sort headers according to @code{message-header-format-alist}
+(@code{message-sort-headers}).
+
+@item C-c C-t
+@kindex C-c C-t
+@findex message-insert-to
+Insert a @code{To} header that contains the @code{Reply-To} or
+@code{From} header of the message you're following up
+(@code{message-insert-to}).
+
+@item C-c C-n
+@kindex C-c C-n
+@findex message-insert-newsgroups
+Insert a @code{Newsgroups} header that reflects the @code{Followup-To}
+or @code{Newsgroups} header of the article you're replying to
+(@code{message-insert-newsgroups}).
+
+@item C-c C-l
+@kindex C-c C-l
+@findex message-to-list-only
+Send a message to the list only.  Remove all addresses but the list
+address from @code{To:} and @code{Cc:} headers.
+
+@item C-c M-n
+@kindex C-c M-n
+@findex message-insert-disposition-notification-to
+Insert a request for a disposition
+notification. (@code{message-insert-disposition-notification-to}).
+This means that if the recipient support RFC 2298 she might send you a
+notification that she received the message.
+
 @item M-x message-insert-importance-high
 @kindex M-x message-insert-importance-high
 @findex message-insert-importance-high
-Insert a @samp{Importance:} header with a value of @samp{high},
+@cindex Importance
+Insert an @samp{Importance:} header with a value of @samp{high},
 deleting headers if necessary.
 
 @item M-x message-insert-importance-low
 @kindex M-x message-insert-importance-low
 @findex message-insert-importance-low
-Insert a @samp{Importance:} header with a value of @samp{low},
-deleting headers if necessary.
+@cindex Importance
+Insert an @samp{Importance:} header with a value of @samp{low}, deleting
+headers if necessary.
+
+@item C-c C-f s
+@kindex C-c C-f s
+@findex message-change-subject
+@cindex Subject
+Change the current @samp{Subject:} header.  Ask for new @samp{Subject:}
+header and append @code{(was: <Old Subject>)}.  The old subject can be
+stripped on replying, see @code{message-subject-trailing-was-query}
+(@pxref{Message Headers}).
+
+@item C-c C-f x
+@kindex C-c C-f x
+@findex message-cross-post-followup-to
+@vindex message-cross-post-default
+@cindex X-Post
+@cindex cross-post
+Ask for an additional @samp{Newsgroups:} and @samp{FollowUp-To:} for a
+cross-post.  @code{message-cross-post-followup-to} mangles
+@samp{FollowUp-To:} and @samp{Newsgroups:} header to point to group.
+If @code{message-cross-post-default} is @code{nil} or if called with a
+prefix-argument @samp{Follow-Up:} is set, but the message is not
+cross-posted.
+
+@item C-c C-f t
+@kindex C-c C-f t
+@findex message-reduce-to-to-cc
+Replace contents of @samp{To:} header with contents of @samp{Cc:} or
+@samp{Bcc:} header.
+
+@item C-c C-f a
+@kindex C-c C-f a
+@findex message-add-archive-header
+@vindex message-archive-header
+@vindex message-archive-note
+@cindex X-No-Archive
+Insert @samp{X-No-Archive: Yes} in the header and a note in the body.
+The header and the note can be customized using
+@code{message-archive-header} and @code{message-archive-note}.  When
+called with a prefix argument, ask for a text to insert.  If you don't
+want the note in the body, set @code{message-archive-note} to
+@code{nil}.
 
 @end table
 
@@ -672,13 +774,17 @@ Insert a signature at the end of the buffer
 @findex message-insert-headers
 Insert the message headers (@code{message-insert-headers}).
 
-@item C-c M-n
-@kindex C-c M-n
-@findex message-insert-disposition-notification-to
-Insert a request for a disposition
-notification. (@code{message-insert-disposition-notification-to}).
-This means that if the recipient support RFC 2298 she might send you a
-notification that she received the message.
+@item C-c M-m
+@kindex C-c M-m
+@findex message-mark-inserted-region
+Mark some region in the current article with enclosing tags.
+See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+
+@item C-c M-f
+@kindex C-c M-f
+@findex message-mark-insert-file
+Insert a file in the current article with enclosing tags.
+See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
 
 @end table
 
@@ -946,36 +1052,6 @@ If point is before @samp{And} and you press @kbd{M-RET}, you'll get:
 
 @samp{*} says where point will be placed.
 
-@item C-c C-t
-@kindex C-c C-t
-@findex message-insert-to
-Insert a @code{To} header that contains the @code{Reply-To} or
-@code{From} header of the message you're following up
-(@code{message-insert-to}).
-
-@item C-c M-t
-@kindex C-c M-t
-@findex message-insert-wide-reply
-Insert @code{To} and @code{Cc} headers that contains addresses as if
-you were doing a wide reply to the original message
-(@code{message-insert-wide-reply}).  This usually means that all
-addresses from @code{To}, @code{From}/@code{Reply-To}, and @code{Cc}
-will be picked up.
-
-@item C-c C-n
-@kindex C-c C-n
-@findex message-insert-newsgroups
-Insert a @code{Newsgroups} header that reflects the @code{Followup-To}
-or @code{Newsgroups} header of the article you're replying to
-(@code{message-insert-newsgroups}).
-
-@item C-c C-o
-@kindex C-c C-o
-@findex message-sort-headers
-@vindex message-header-format-alist
-Sort headers according to @code{message-header-format-alist}
-(@code{message-sort-headers}).
-
 @item C-c M-r
 @kindex C-c M-r
 @findex message-rename-buffer
@@ -1224,6 +1300,18 @@ responding to a message:
      "^\\(\\(\\([Rr][Ee]\\|[Ss][Vv]\\|[Aa][Ww]\\): *\\)+\\)")
 @end lisp
 
+@item message-subject-trailing-was-query
+@vindex message-subject-trailing-was-query
+@vindex message-subject-trailing-was-ask-regexp
+@vindex message-subject-trailing-was-regexp
+Controls what to do with trailing @samp{(was: <old subject>)} in subject
+lines.  If @code{nil}, leave the subject unchanged.  If it is the symbol
+@code{ask}, query the user what do do.  In this case, the subject is
+matched against @code{message-subject-trailing-was-ask-regexp}.  If
+@code{message-subject-trailing-was-query} is t, always strip the
+trailing old subject.  In this case,
+@code{message-subject-trailing-was-regexp} is used.
+
 @item message-alternative-emails
 @vindex message-alternative-emails
 A regexp to match the alternative email addresses.  The first matched
@@ -1642,6 +1730,14 @@ This can also be a list of functions.  Each function can find the
 citation between @code{(point)} and @code{(mark t)}.  And each function
 should leave point and mark around the citation text as modified.
 
+@item message-mark-insert-begin
+@vindex message-mark-insert-begin
+String to mark the beginning of some inserted text.
+
+@item message-mark-insert-end
+@vindex message-mark-insert-end
+String to mark the end of some inserted text.
+
 @item message-signature
 @vindex message-signature
 String to be inserted at the end of the message buffer.  If @code{t}