aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/rmail.texi8
-rw-r--r--etc/NEWS1
-rw-r--r--lisp/mail/rmail.el3
4 files changed, 13 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9f51d9bbde..160a0402fe 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
2012-02-08 Glenn Morris <[email protected]>
+ * rmail.texi (Rmail Display): Mention rmail-epa-decrypt.
+
* text.texi (LaTeX Editing): Mention latex-electric-env-pair-mode.
2012-02-07 Glenn Morris <[email protected]>
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index be1c1f68c6..18556d4a5e 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1118,7 +1118,7 @@ buffer before sorting it.
@section Display of Messages
This section describes how Rmail displays mail headers,
-@acronym{MIME} sections and attachments, and URLs.
+@acronym{MIME} sections and attachments, URLs, and encrypted messages.
@table @kbd
@item t
@@ -1209,6 +1209,12 @@ variable @code{rmail-enable-mime} to @code{nil}. When this is the
case, the @kbd{v} (@code{rmail-mime}) command instead creates a
temporary buffer to display the current @acronym{MIME} message.
+@findex rmail-epa-decrypt
+@cindex encrypted mails (reading in Rmail)
+ If the current message is an encrypted one, use the command @kbd{M-x
+rmail-epa-decrypt} to decrypt it, using the EasyPG library
+(@pxref{Top,,, epa, EasyPG Assistant User's Manual}).
+
You can highlight and activate URLs in the Rmail buffer using Goto
Address mode:
diff --git a/etc/NEWS b/etc/NEWS
index d0993707cf..4d67a0f8d4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -762,6 +762,7 @@ more variants, including Mercury, and a lot more.
** Rmail
++++
*** The command `rmail-epa-decrypt' decrypts OpenPGP data
in the Rmail incoming message.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7d4c7c1544..2ed54aa8d8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4363,6 +4363,9 @@ encoded string (and the same mask) will decode the string."
(setq i (1+ i)))
(concat string-vector)))
+;; Should this have a key-binding, or be in a menu?
+;; There doesn't really seem to be an appropriate menu.
+;; Eg the edit command is not in a menu either.
(defun rmail-epa-decrypt ()
"Decrypt OpenPGP armors in current message."
(interactive)