Please install this bug fix.

Please install this bug fix.

[Richard Stallman]

This is a bug fix -- would someone please install it for me and ack,
so I don't have to wrestle with git?


2017-02-14  Richard Stallman  <rms@gnu.org>

* 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.

diff -u /home/rms/emacs-git/build-dec-29/lisp/mail/rmail.el.\~1\~ /home/rms/emacs-git/build-dec-29/lisp/mail/rmail.el
--- /home/rms/emacs-git/build-dec-29/lisp/mail/rmail.el.~1~	2016-06-05 14:08:01.998804517 -0400
+++ /home/rms/emacs-git/build-dec-29/lisp/mail/rmail.el	2017-01-07 19:24:41.104269774 -0500
@@ -4590,7 +4590,8 @@
          (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 @@
 		      ;; 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

Diff finished.  Tue Feb 14 16:06:09 2017

-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: Please install this bug fix.

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

On 02/15/2017 02:31 AM, Richard Stallman wrote:
> This is a bug fix -- would someone please install it for me and ack,
> so I don't have to wrestle with git?

Done. The byte compiler complained about the resulting Elisp, so I 
installed the attached followup patch.

Is the problem with Git that your laptop doesn't have sufficient CPU or 
I/O power, or is it something we can fix by altering the software?


[-- Attachment #2: 0001-Fixup-recent-rmail-patch.patch --]
[-- Type: application/x-patch, Size: 904 bytes --]