[Emacs-diffs] emacs-25 7a0786e: Document new features of Rmail

[Eli Zaretskii]

branch: emacs-25
commit 7a0786e7db9bb48a3f9745f5e631dddcb95f4019
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Document new features of Rmail
    
    * doc/emacs/rmail.texi (Rmail Summary Edit, Rmail Deletion):
    Document new behavior of 'd' and 'C-d' with numeric argument.
    (Rmail Display): Document the rendering of HTML MIME parts.
---
 doc/emacs/rmail.texi |   27 +++++++++++++++++----------
 etc/NEWS             |    2 ++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 6e2a60b..bf8258a 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -282,9 +282,9 @@ current message and select another.  @kbd{d}
 messages already deleted, while @kbd{C-d} (@code{rmail-delete-backward})
 moves to the previous nondeleted message.  If there is no nondeleted
 message to move to in the specified direction, the message that was just
-deleted remains current.  @kbd{d} with a prefix argument is equivalent
-to @kbd{C-d}.  Note that the Rmail summary versions of these commands
-behave slightly differently (@pxref{Rmail Summary Edit}).
+deleted remains current.  A numeric prefix argument serves as a repeat
+count, to allow deletion of several messages in a single command.  A
+negative argument reverses the meaning of @kbd{d} and @kbd{C-d}.
 
 @c mention other hooks, e.g., show message hook?
 @vindex rmail-delete-message-hook
@@ -974,13 +974,11 @@ different lines.  It doesn't matter what Emacs command 
you use to move
 point; whichever line point is on at the end of the command, that
 message is selected in the Rmail buffer.
 
-  Almost all Rmail commands work in the summary buffer as well as in the
-Rmail buffer.  Thus, @kbd{d} in the summary buffer deletes the current
-message, @kbd{u} undeletes, and @kbd{x} expunges.  (However, in the
-summary buffer, a numeric argument to @kbd{d}, @kbd{C-d} and @kbd{u}
-serves as a repeat count.  A negative argument reverses the meaning of
address@hidden and @kbd{C-d}.  Also, if there are no more undeleted messages in
-the relevant direction, the delete commands go to the first or last
+  Almost all Rmail commands work in the summary buffer as well as in
+the Rmail buffer.  Thus, @kbd{d} in the summary buffer deletes the
+current message, @kbd{u} undeletes, and @kbd{x} expunges.  (However,
+in the summary buffer, if there are no more undeleted messages in the
+relevant direction, the delete commands go to the first or last
 message, rather than staying on the current message.)  @kbd{o} and
 @kbd{C-o} output the current message to a FILE; @kbd{r} starts a reply
 to it; etc.  You can scroll the current message while remaining in the
@@ -1224,6 +1222,15 @@ tagline (except for buttons for other actions, if there 
are any).  Type
 the undecoded @acronym{MIME} data.  With a prefix argument, this
 command toggles the display of only an entity at point.
 
address@hidden rmail-mime-prefer-html
+  If the message has an @acronym{HTML} @acronym{MIME} part, Rmail
+displays it in preference to the plain-text part, if Emacs can render
address@hidden@footnote{
+This capability requires that Emacs be built with @file{libxml2}
+support or that you have the Lynx browser installed.}.  To prevent
+that, and have the plain-text part displayed instead, customize the
+variable @code{rmail-mime-prefer-html} to a @code{nil} value.
+
   To prevent Rmail from handling MIME decoded messages, change the
 variable @code{rmail-enable-mime} to @code{nil}.  When this is the
 case, the @kbd{v} (@code{rmail-mime}) command instead creates a
diff --git a/etc/NEWS b/etc/NEWS
index 4468664..24c7ab8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -720,9 +720,11 @@ alternatives to currently visited manuals.
 
 ** Rmail
 
++++
 *** The Rmail commands d, C-d and u take optional repeat counts to delete or
 undelete multiple messages.
 
++++
 *** Rmail can now render HTML mail messages if your Emacs was built with
 libxml2 or if you have the Lynx browser installed.  By default, Rmail
 will display the HTML version of a mail message that has both HTML and