From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Please install this bug fix. Date: Wed, 15 Feb 2017 05:31:06 -0500 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: blaine.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: blaine.gmane.org 1487156673 10491 195.159.176.226 (15 Feb 2017 11:04:33 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 15 Feb 2017 11:04:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 15 12:04:29 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdxNs-0002KV-Ss for ged-emacs-devel@m.gmane.org; Wed, 15 Feb 2017 12:04:29 +0100 Original-Received: from localhost ([::1]:39724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdxNy-0004vB-M8 for ged-emacs-devel@m.gmane.org; Wed, 15 Feb 2017 06:04:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdwrb-0006W2-Vq for emacs-devel@gnu.org; Wed, 15 Feb 2017 05:31:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdwra-0003H2-VH for emacs-devel@gnu.org; Wed, 15 Feb 2017 05:31:08 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdwra-0003Gu-Rm for emacs-devel@gnu.org; Wed, 15 Feb 2017 05:31:06 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1cdwra-0003AD-5l; Wed, 15 Feb 2017 05:31:06 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:212398 Archived-At: 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 * 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.