unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Richard Stallman <rms@gnu.org>
To: emacs-devel@gnu.org
Subject: Please install this bug fix.
Date: Wed, 15 Feb 2017 05:31:06 -0500	[thread overview]
Message-ID: <E1cdwra-0003AD-5l@fencepost.gnu.org> (raw)

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.




             reply	other threads:[~2017-02-15 10:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-15 10:31 Richard Stallman [this message]
2017-02-15 15:51 ` Please install this bug fix Paul Eggert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1cdwra-0003AD-5l@fencepost.gnu.org \
    --to=rms@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).