diff options
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/rmail.el | 7 | ||||
| -rw-r--r-- | lisp/mail/rmailsum.el | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 63d992d2717..3c74edd1054 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1080,6 +1080,7 @@ The buffer is expected to be narrowed to just the header of the message." (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\177" 'scroll-down-command) (define-key map "?" 'describe-mode) + (define-key map "\C-c\C-d" 'rmail-epa-decrypt) (define-key map "\C-c\C-s\C-d" 'rmail-sort-by-date) (define-key map "\C-c\C-s\C-s" 'rmail-sort-by-subject) (define-key map "\C-c\C-s\C-a" 'rmail-sort-by-author) @@ -1272,6 +1273,7 @@ Instead, these commands are available: \\[rmail-undelete-previous-message] Undelete message. Tries current message, then earlier messages till a deleted message is found. \\[rmail-edit-current-message] Edit the current message. \\[rmail-cease-edit] to return to Rmail. +\\[rmail-epa-decrypt] Decrypt the current message. \\[rmail-expunge] Expunge deleted messages. \\[rmail-expunge-and-save] Expunge and save the file. \\[rmail-quit] Quit Rmail: expunge, save, then switch to another buffer. @@ -4610,11 +4612,10 @@ Argument MIME is non-nil if this is a mime message." "> ") (push (rmail-epa-decrypt-1 mime) decrypts)))) - (when (and decrypts (eq major-mode 'rmail-mode)) - (rmail-add-label "decrypt")) - (when (and decrypts (rmail-buffers-swapped-p)) (when (y-or-n-p "Replace the original message? ") + (when (eq major-mode 'rmail-mode) + (rmail-add-label "decrypt")) (setq decrypts (nreverse decrypts)) (let ((beg (rmail-msgbeg rmail-current-message)) (end (rmail-msgend rmail-current-message))) diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index a085e0bc4ff..9ccc0cfee97 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -121,6 +121,7 @@ Setting this option to nil might speed up the generation of summaries." (define-key map [?\S-\ ] 'rmail-summary-scroll-msg-down) (define-key map "\177" 'rmail-summary-scroll-msg-down) (define-key map "?" 'describe-mode) + (define-key map "\C-c\C-d" 'rmail-summary-epa-decrypt) (define-key map "\C-c\C-n" 'rmail-summary-next-same-subject) (define-key map "\C-c\C-p" 'rmail-summary-previous-same-subject) (define-key map "\C-c\C-s\C-d" 'rmail-summary-sort-by-date) @@ -1482,6 +1483,12 @@ argument says to read a file name and use that file as the inbox." (rmail-edit-current-message) (use-local-map rmail-summary-edit-map)) +(defun rmail-summary-epa-decrypt () + "Decrypt this message." + (interactive) + (rmail-pop-to-buffer rmail-buffer) + (rmail-epa-decrypt)) + (defun rmail-summary-cease-edit () "Finish editing message, then go back to Rmail summary buffer." (interactive) |