Merge from savannah/emacs-30

19791839cfb ; Don't document a complicated default
88bc748f52f Fix minibuffer-next-completion in completing-read-multiple
737f249aa2c ; Document 'completing-read-multiple' in the ELisp manual
37f25514602 ; * lisp/gnus/nnweb.el (nnweb-type): Doc fix.

2 files changed, 11 insertions, 6 deletions

diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index ecd34b95294..42189b9d0d7 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1242,6 +1242,16 @@ different function to completely override the normal behavior of
 @code{completing-read}.
 @end defvar
 
+@findex completing-read-multiple
+@vindex crm-separator
+If you need to prompt the user for several strings, like several
+elements of a list or several parameters (e.g., user, host, and port) of
+a connection, you can use @code{completing-read-multiple}.  It allows
+typing several strings separated by a separator string (by default, tabs
+and commas; customize @code{crm-separator} to change that), and provides
+completion for each individual string the user types.  It returns the
+strings that were read, as a list.
+
 @node Completion Commands
 @subsection Minibuffer Commands that Do Completion
 
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 509bbd5b575..48ac487088e 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -289,12 +289,7 @@ supersede the message in the current buffer.
 
 @vindex message-ignored-supersedes-headers
 Headers matching the @code{message-ignored-supersedes-headers} are
-removed before popping up the new message buffer.  The default is@*
-@samp{^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|@*
-^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|@*
-Return-Path:\\|^Supersedes:\\|^NNTP-Posting-Date:\\|^X-Trace:\\|@*
-^X-Complaints-To:\\|^Cancel-Lock:\\|^Cancel-Key:\\|^X-Hashcash:\\|@*
-^X-Payment:\\|^Approved:}.
+removed before popping up the new message buffer.