Revision: [email protected]/emacs--cvs-trunk--0--patch-571

Merge from gnus--rel--5.10

Patches applied:

 * [email protected]/gnus--rel--5.10--patch-31
 - [email protected]/gnus--rel--5.10--patch-33
   Update from CVS

4 files changed, 149 insertions, 48 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 7b20cda2bc..3e7b9d8818 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,50 @@
+2004-09-23  Reiner Steib  <[email protected]>
+
+	* gnus-faq.texi ([5.12]): Fix code example for FQDN in Message-Ids
+	again.
+	Use 5.10 instead of 5.10.0.
+
+2004-09-20  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus.texi (Summary Mail Commands): S D e.
+
+2004-09-20  Raymond Scholz  <[email protected]>  (tiny change)
+
+	* gnus.texi (Misc Article): Refer to `Summary Buffer Mode Line' in
+	the gnus-article-mode-line-format section.
+
+2004-09-20  Helmut Waitzmann  <[email protected]>  (tiny change)
+
+	* gnus.texi (Various Summary Stuff): Fix the documentation for
+	gnus-newsgroup-variables.
+
+2004-09-20  Reiner Steib  <[email protected]>
+
+	* gnus.texi (MIME Commands): Added
+	gnus-mime-display-multipart-as-mixed,
+	gnus-mime-display-multipart-alternative-as-mixed,
+	gnus-mime-display-multipart-related-as-mixed.
+	(Mail Source Customization): Clarify `mail-source-directory'.
+	(Splitting Mail): Mention gnus-group-find-new-groups.
+	(SpamOracle): Fixed typo.
+
+	* gnus-faq.texi: Untabify.
+	([6.3]): nnir.el is in contrib directory.  
+
+	* message.texi (News Headers): Clarify how a unique ID is created.
+
+	* gnus.texi (Batching Agents): Fixed typo in example.  Reported
+	by Hiroshi Fujishima <[email protected]>.
+
+2004-09-20  Andre Srinivasan  <[email protected]>
+
+	* gnus.texi (Group Parameters): Added more on hooks.  (Small
+	change.)
+
+2004-09-20  Florian Weimer  <[email protected]>
+
+	* gnus.texi (Charsets): Point to relevant section in emacs-mime.
+
 2004-09-22  Luc Teirlinck  <[email protected]>
 
 	* display.texi (Display Custom): Remove stray `@end defvar'.
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 42789ffa1f..6f0fddc556 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -102,7 +102,7 @@ Gnus is a Usenet Newsreader and Electronic Mail User Agent implemented
 
 @menu
 * [1.1]::   What is the latest version of Gnus?
-* [1.2]::   What's new in 5.10.0?
+* [1.2]::   What's new in 5.10?
 * [1.3]::   Where and how to get Gnus?
 * [1.4]::   What to do with the tarball now? 
 * [1.5]::   Which version of Emacs do I need?
@@ -119,7 +119,7 @@ What is the latest version of Gnus?
 
 Answer: 
 
- Jingle please: Gnus 5.10.0 is released, get it while it's
+ Jingle please: Gnus 5.10 is released, get it while it's
  hot! As well as the step in version number is rather
  small, Gnus 5.10 has tons of new features which you
  shouldn't miss, however if you are cautious, you might
@@ -131,7 +131,7 @@ Answer:
 @end ifnottex
 @subsubheading Question 1.2: 
 
-What's new in 5.10.0?
+What's new in 5.10?
 
 Answer: 
 
@@ -227,7 +227,7 @@ Which version of Emacs do I need?
 
 Answer: 
 
- Gnus 5.10.0 requires an Emacs version that is greater
+ Gnus 5.10 requires an Emacs version that is greater
  than or equal to Emacs 20.7 or XEmacs 21.1.
  
 @ifnottex
@@ -440,7 +440,7 @@ the line
 @example
 
 SET HOME=C:\myhome
-	    
+            
 @end example
 
 @noindent
@@ -548,9 +548,9 @@ Answer:
 
 @example
 (add-to-list 'gnus-secondary-select-methods 
-	     '(nntp "news.yourSecondProvider.net"))
+             '(nntp "news.yourSecondProvider.net"))
 (add-to-list 'gnus-secondary-select-methods 
-	     '(nntp "news.yourThirdProvider.net"))	    
+             '(nntp "news.yourThirdProvider.net"))          
 @end example
  
 @ifnottex
@@ -745,9 +745,9 @@ Answer:
 (add-to-list 
  'gnus-secondary-select-methods
  '(nnimap "Give the baby a name"
-	  (nnimap-address "imap.yourProvider.net")
-	  (nnimap-port 143)
-	  (nnimap-list-pattern "archive.*")))
+          (nnimap-address "imap.yourProvider.net")
+          (nnimap-port 143)
+          (nnimap-list-pattern "archive.*")))
 @end example
 
 @noindent
@@ -877,7 +877,7 @@ Answer:
  fetched when you enter a group and slow down the process of entering a group).
  
 
- If you already use Gnus 5.10.0, you can say 
+ If you already use Gnus 5.10, you can say 
  @samp{/o N} 
  In summary buffer to load the last N messages, this feature is not available in 5.8.8
  
@@ -1000,7 +1000,7 @@ Answer:
 
 Answer: 
 
- Only if you use Gnus 5.10.0 or younger. In this case you've got the
+ Only if you use Gnus 5.10 or younger. In this case you've got the
  choice between w3, w3m, links, lynx and html2text, which
  one is used can be specified in the variable
  mm-text-html-renderer, so if you want links to render your
@@ -1033,7 +1033,7 @@ Answer:
  @samp{W Y f} gives you full deuglify.
  See @samp{W Y C-h} or
  have a look at the menus for other deuglifications).
- Outlook deuglify is only available since Gnus 5.10.0.
+ Outlook deuglify is only available since Gnus 5.10.
  
 @ifnottex
 @node [4.9], [4.10], [4.8], FAQ 4 - Reading messages
@@ -1204,8 +1204,8 @@ Answer:
 @example
 (gnus-add-configuration 
  '(article (vertical 1.0
-		     (summary .35 point)
-		     (article 1.0))))
+                     (summary .35 point)
+                     (article 1.0))))
 @end example
  
 
@@ -1252,7 +1252,7 @@ Answer:
  sadly hard tabulators are broken in 5.8.8.
  
 
- Since 5.10.0, Gnus offers you some very nice new specifiers,
+ Since 5.10, Gnus offers you some very nice new specifiers,
  e.g. %B which draws a thread-tree and %&user-date which
  gives you a date where the details are dependent of the
  articles age. Here's an example which uses both:
@@ -1771,7 +1771,7 @@ Answer:
 @end example
 
 @noindent
- if you already use Gnus 5.10.0, if you still use 5.8.8 or
+ if you already use Gnus 5.10, if you still use 5.8.8 or
  5.9 try this instead:
  
 
@@ -1793,7 +1793,7 @@ Answer:
 
 Answer: 
 
- Since 5.10.0 Gnus doesn't generate a sender header by
+ Since 5.10 Gnus doesn't generate a sender header by
  default. For older Gnus' try this in ~/.gnus:
  
 
@@ -1851,10 +1851,10 @@ Answer:
 @end example
 @noindent
  in ~/.gnus.  If you use Gnus 5.9 or ealier, you can use this
-instead:
+instead (works for newer versions a well):
 @example
 (eval-after-load "message"
-  '(let (myfqdn "yourmachine.yourdomain.tld");; <-- Edit this!
+  '(let ((fqdn "yourmachine.yourdomain.tld"));; <-- Edit this!
      (if (boundp 'message-user-fqdn)
          (setq message-user-fqdn fqdn)
        (gnus-message 1 "Redefining `message-make-fqdn'.")
@@ -2021,7 +2021,7 @@ Answer:
  the raw message, look for the message-id, and say
  @samp{M-^ the@@message.id RET} in a
  summary buffer.
- Since Gnus 5.10.0 there's also a Gnus interface for
+ Since Gnus 5.10 there's also a Gnus interface for
  groups.google.com which you can call with
  @samp{G W}) in group buffer.
  
@@ -2046,9 +2046,9 @@ Answer:
  engines and with the help of nnir you can search trough
  the indexed mail and generate a temporary group with all
  messages which met your search criteria. If this sound
- cool to you get nnir.el from
- @uref{ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/}
- or @uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
+ cool to you get nnir.el from the contrib directory of the Gnus
+ distribution or
+ @uref{http://quimby.gnus.org/cgi-bin/cvsweb.cgi/~checkout~/gnus/contrib/nnir.el?rev=HEAD&content-type=text/plain}
  Instructions on how to use it are at the top of the file.
  
 @ifnottex
@@ -2231,7 +2231,7 @@ Answer:
  later when you're offline. It kind of mimics offline
  newsreaders like e.g. Forte Agent. If you want to use
  the Agent place the following in ~/.gnus if you are
- still using 5.8.8 or 5.9 (it's the default since 5.10.0):
+ still using 5.8.8 or 5.9 (it's the default since 5.10):
  
 
 @example
@@ -2524,7 +2524,7 @@ Answer:
 
 @noindent
  in ~/.emacs. If you don't care about width of CJK
- characters or use Gnus 5.10.0 or younger together with a
+ characters or use Gnus 5.10 or younger together with a
  recent GNU Emacs, you should say
  
 
@@ -2538,7 +2538,7 @@ Answer:
  two suggestions). Finally if you are still using 5.8.8
  or 5.9 and experience speed problems with summary
  buffer generation, you definitely should update to
- 5.10.0 since there quite some work on improving it has
+ 5.10 since there quite some work on improving it has
  been done.
  
 @ifnottex
diff --git a/man/gnus.texi b/man/gnus.texi
index b435a34b46..aa3c3d09c5 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -3013,11 +3013,23 @@ tag can be removed from the article subjects in the summary buffer for
 the group by putting @code{(gnus-list-identifiers "DOCBOOK-APPS:")}
 into the group parameters for the group.
 
-This can also be used as a group-specific hook function, if you'd like.
-If you want to hear a beep when you enter a group, you could put
-something like @code{(dummy-variable (ding))} in the parameters of that
-group.  @code{dummy-variable} will be set to the result of the
-@code{(ding)} form, but who cares?
+This can also be used as a group-specific hook function.  If you want to
+hear a beep when you enter a group, you could put something like
+@code{(dummy-variable (ding))} in the parameters of that group.
+@code{dummy-variable} will be set to the (meaningless) result of the
+@code{(ding)} form.  
+
+Alternatively, since the VARIABLE becomes local to the group, this
+pattern can be used to temporarily change a hook.  For example, if the
+following is added to a group parameter
+
+@lisp
+(gnus-summary-prepared-hook
+  '(lambda nil (local-set-key "d" (local-key-binding "n"))))
+@end lisp
+
+when the group is entered, the 'd' key will not mark the article as
+expired.
 
 @end table
 
@@ -5368,6 +5380,13 @@ to the @code{root} account, you may want to resend it to
 This command understands the process/prefix convention
 (@pxref{Process/Prefix}).
 
+@item S D e
+@kindex S D e (Summary)
+@findex gnus-summary-resend-message-edit
+
+Like the previous command, but will allow you to edit the message as
+if it were a new message before resending.
+
 @item S O m
 @kindex S O m (Summary)
 @findex gnus-uu-digest-mail-forward
@@ -9328,6 +9347,26 @@ Here's an example function the does the latter:
 @item gnus-mime-multipart-functions
 Alist of @acronym{MIME} multipart types and functions to handle them.
 
+@vindex gnus-mime-display-multipart-alternative-as-mixed
+@item gnus-mime-display-multipart-alternative-as-mixed
+Display "multipart/alternative" parts as "multipart/mixed".
+
+@vindex gnus-mime-display-multipart-related-as-mixed
+@item gnus-mime-display-multipart-related-as-mixed
+Display "multipart/related" parts as "multipart/mixed".
+
+If displaying "text/html" is discouraged, see
+@code{mm-discouraged-alternatives} in @ref{Display Customization,
+Display Customization, , emacs-mime, Emacs-Mime Manual}.  Images or
+other material inside a "multipart/related" part might be overlooked
+when this variable is nil.
+
+@vindex gnus-mime-display-multipart-as-mixed
+@item gnus-mime-display-multipart-as-mixed
+Display "multipart" parts as "multipart/mixed".  If t, it overrides nil
+values of @code{gnus-mime-display-multipart-alternative-as-mixed} and
+@code{gnus-mime-display-multipart-related-as-mixed}.
+
 @vindex mm-file-name-rewrite-functions
 @item mm-file-name-rewrite-functions
 List of functions used for rewriting file names of @acronym{MIME} parts.
@@ -9424,6 +9463,10 @@ encode using quoted-printable) or @code{t} (always use 8bit).
 @cindex coding system aliases
 @cindex preferred charset
 
+@xref{Encoding Customization, , Encoding Customization, emacs-mime,
+The Emacs MIME Manual}, for additional variables that control which
+MIME charsets are used when sending messages.
+
 Other charset tricks that may be useful, although not Gnus-specific:
 
 If there are several @acronym{MIME} charsets that encode the same Emacs
@@ -10136,11 +10179,19 @@ the list in one particular group:
 @vindex gnus-newsgroup-variables
 @item gnus-newsgroup-variables
 A list of newsgroup (summary buffer) local variables, or cons of
-variables and their default values (when the default values are not
-@code{nil}), that should be made global while the summary buffer is
-active.  These variables can be used to set variables in the group
-parameters while still allowing them to affect operations done in
-other buffers.  For example:
+variables and their default expressions to be evalled (when the default
+values are not @code{nil}), that should be made global while the summary
+buffer is active.
+
+Note: The default expressions will be evaluated (using function
+@code{eval}) before assignment to the local variable rather than just
+assigned to it.  If the default expression is the symbol @code{global},
+that symbol will not be evaluated but the global value of the local
+variable will be used instead.
+
+These variables can be used to set variables in the group parameters
+while still allowing them to affect operations done in other
+buffers.  For example:
 
 @lisp
 (setq gnus-newsgroup-variables
@@ -10149,6 +10200,7 @@ other buffers.  For example:
  "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:")))
 @end lisp
 
+Also @pxref{Group Parameters}.
 @end table
 
 
@@ -11269,9 +11321,9 @@ no more new text to scroll in.  The default is @code{nil}.
 @vindex gnus-article-mode-line-format
 @item gnus-article-mode-line-format
 This variable is a format string along the same lines as
-@code{gnus-summary-mode-line-format} (@pxref{Mode Line Formatting}).  It
-accepts the same format specifications as that variable, with two
-extensions:
+@code{gnus-summary-mode-line-format} (@pxref{Summary Buffer Mode
+Line}).  It accepts the same format specifications as that variable,
+with two extensions:
 
 @table @samp
 
@@ -13203,7 +13255,9 @@ expression should @emph{always} be @samp{*} so that it matches any mails
 that haven't been matched by any of the other regexps.  (These rules are
 processed from the beginning of the alist toward the end.  The first
 rule to make a match will ``win'', unless you have crossposting enabled.
-In that case, all matching rules will ``win''.)
+In that case, all matching rules will ``win''.)  When new groups are
+created by splitting mail, you may want to run
+@code{gnus-group-find-new-groups} to see the new groups.
 
 If you like to tinker with this yourself, you can set this variable to a
 function of your choice.  This function will be called without any
@@ -13771,10 +13825,10 @@ If non-@code{nil}, ignore errors when reading mail from a mail source.
 
 @item mail-source-directory
 @vindex mail-source-directory
-Directory where files (if any) will be stored.  The default is
-@file{~/Mail/}.  At present, the only thing this is used for is to say
-where the incoming files will be stored if the previous variable is
-@code{nil}.
+Directory where incoming mail source files (if any) will be stored.  The
+default is @file{~/Mail/}.  At present, the only thing this is used for
+is to say where the incoming files will be stored if the variable
+@code{mail-source-delete-incoming} is @code{nil} or a number.
 
 @item mail-source-incoming-file-prefix
 @vindex mail-source-incoming-file-prefix
@@ -18624,7 +18678,7 @@ following incantation:
 
 @example
 #!/bin/sh
-emacs -batch -l ~/.emacs -f -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
+emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
 @end example
 
 
diff --git a/man/message.texi b/man/message.texi
index acc043d8e8..6a52698ddb 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -1551,8 +1551,8 @@ This optional header will be computed by Message.
 @cindex Sun
 @cindex i-did-not-set--mail-host-address--so-tickle-me
 This required header will be generated by Message.  A unique ID will be
-created based on the date, time, user name and system name.  For the
-domain part, message will look (in this order) at
+created based on the date, time, user name (for the local part) and the
+domain part.  For the domain part, message will look (in this order) at
 @code{message-user-fqdn}, @code{system-name}, @code{mail-host-address}
 and @code{message-user-mail-address} (i.e. @code{user-mail-address})
 until a probably valid fully qualified domain name (FQDN) was found.