Commit 971f4fab authored by Richard Stallman's avatar Richard Stallman Committed by Paul Eggert
Browse files

Rmail fix

* lisp/mail/rmail.el (rmail-epa-decrypt-1): Include the just-decrypted text
as element 4 of the value.
(rmail-epa-decrypt): Take the text to insert from that element.
parent 96e18ebb
......@@ -4590,7 +4590,8 @@ Argument MIME is non-nil if this is a mime message."
(current-buffer))))
(list armor-start (- (point-max) after-end) mime
armor-end-regexp)))
armor-end-regexp
(buffer-substring armor-start (- (point-max) after-end)))))
(declare-function rmail-mime-entity-truncated "rmailmm" (entity))
......@@ -4652,7 +4653,7 @@ Argument MIME is non-nil if this is a mime message."
;; Found as expected -- now replace it with the decrypt.
(when armor-end
(delete-region armor-start armor-end)
(insert-buffer-substring from-buffer (nth 0 d) (nth 1 d)))
(insert (nth 4 d)))
;; Change the mime type (if this is in a mime part)
;; so this part will display by default
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment