[Emacs-diffs] master 971f4fa 1/2: Rmail fix

[Paul Eggert]

branch: master
commit 971f4fabfacfce02b5bb7f4c2b9ede6a127a46bd
Author: Richard Stallman <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 lisp/mail/rmail.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 010d8e3..55543f2 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -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