From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daiki Ueno Newsgroups: gmane.emacs.devel Subject: Re: update of the EasyPG integration patch (Re: minor fixes for EasyPG Date: Mon, 28 Apr 2008 08:21:21 +0900 Message-ID: <87lk2ydgum.fsf@broken.deisui.org> References: <877ifjd24v.fsf@broken.deisui.org> <87r6dqywer.fsf@grepfind.mwolson.org> <87r6d338n2.fsf_-_@broken.deisui.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1209338538 15346 80.91.229.12 (27 Apr 2008 23:22:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 27 Apr 2008 23:22:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris , Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 28 01:22:53 2008 connect(): Connection refused Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JqGCq-00016Z-TP for ged-emacs-devel@m.gmane.org; Mon, 28 Apr 2008 01:22:53 +0200 Original-Received: from localhost ([127.0.0.1]:49176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JqGCA-0006UW-6V for ged-emacs-devel@m.gmane.org; Sun, 27 Apr 2008 19:22:10 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JqGC6-0006Sz-BF for emacs-devel@gnu.org; Sun, 27 Apr 2008 19:22:06 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JqGC3-0006Qv-Vc for emacs-devel@gnu.org; Sun, 27 Apr 2008 19:22:06 -0400 Original-Received: from [199.232.76.173] (port=59434 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JqGC3-0006Qp-Si for emacs-devel@gnu.org; Sun, 27 Apr 2008 19:22:03 -0400 Original-Received: from wf-out-1314.google.com ([209.85.200.169]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JqGC3-0006AV-JI for emacs-devel@gnu.org; Sun, 27 Apr 2008 19:22:03 -0400 Original-Received: by wf-out-1314.google.com with SMTP id 29so3946647wff.24 for ; Sun, 27 Apr 2008 16:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references:date:in-reply-to:message-id:user-agent:mime-version:content-type:sender; bh=Vw32EjUGaL2xbNva1W9q6m9bgHkcb7zGyWOvCVclNSs=; b=Ei+EiFTWWdbtjkZXsNwrg6K+xZOCo1ebHwjtIWATL/pumy1DmM4ROKyLWHF4HvhAy+N7O7oNanY2g2LR4p54xBsPaF5JZG/76Yf9IuhFFSJAowxSn53YnkwER0P6fStqWaq1b4DnKL+glwfKKNEP2Wy0HGtK4PHL9zmtulviqhc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id:user-agent:mime-version:content-type:sender; b=nHZ++Psi9s06gJOCp5mA/aSJSPg27OCzCYdYtwnJNoD3QhF17E93zACO8zM3qLrQ4lD/ogroYc3675wrtVQDRRtGeIHDHTA7AZUbXX6+WskESX9rnsaMMnLgl0bzUUOCJK+y2xhD/CB1cK6ApIr3FfqanmFaCyohTiuOkZDivCs= Original-Received: by 10.143.156.15 with SMTP id i15mr2012507wfo.276.1209338521205; Sun, 27 Apr 2008 16:22:01 -0700 (PDT) Original-Received: from broken ( [202.83.187.18]) by mx.google.com with ESMTPS id 29sm10293319wfg.9.2008.04.27.16.21.59 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 27 Apr 2008 16:22:00 -0700 (PDT) In-Reply-To: (Glenn Morris's message of "Sun, 27 Apr 2008 16:35:09 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:96030 Archived-At: --=-=-= Glenn Morris writes: >> --- a/lisp/epa-file.el >> +++ b/lisp/epa-file.el >> @@ -126,7 +126,10 @@ May either be a string or a list of strings.") >> (defun epa-file-handler (operation &rest args) >> (save-match-data >> (let ((op (get operation 'epa-file))) >> - (if op >> + (if (and op >> + (if (and (eq operation 'insert-file-contents) >> + >> + (y-or-n-p "" >> (apply op args) >> (epa-file-run-real-handler operation args))))) > > This is broken. Oops, I'm sorry. That is a wreck of a hack which reverted before sending the patch. Could you please apply the following fix (diff from the current trunk)? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=epa-file.el.diff Index: lisp/epa-file.el =================================================================== RCS file: /sources/emacs/emacs/lisp/epa-file.el,v retrieving revision 1.7 diff -r1.7 epa-file.el 127,135c127,132 < ;; (save-match-data < ;; (let ((op (get operation 'epa-file))) < ;; (if (and op < ;; (if (and (eq operation 'insert-file-contents) < < ;; (y-or-n-p "" < ;; (apply op args) < ;; (epa-file-run-real-handler operation args))))) < nil) --- > (save-match-data > (let ((op (get operation 'epa-file))) > (if op > (apply op args) > (epa-file-run-real-handler operation args))))) > --=-=-= Regards, -- Daiki Ueno --=-=-=--