From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#74881: 31.0.50; [PATCH] * lisp/vc/ediff-util.el: Remove temp files on kill-emacs Date: Sat, 28 Dec 2024 09:38:08 +0200 Message-ID: <864j2ow93z.fsf@gnu.org> References: <86h675s77g.fsf@gnu.org> <864j2py29u.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4404"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 74881@debbugs.gnu.org To: Lin Sun Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 28 08:41:18 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tRRRl-00011L-9w for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 28 Dec 2024 08:41:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRRRb-00085j-FB; Sat, 28 Dec 2024 02:41:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRRRW-00085F-Q3 for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2024 02:41:03 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tRRRW-00042Q-Hc for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2024 02:41:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-Reply-To:From:Date:To:Subject; bh=39hBrNTX3A5EsOfYKI5pTRc0fz8rbF6qd7PuDH7xe8w=; b=WXfh30S5ByesobwsTthaDjPy1rlaOZ6AR3JzJezj4px0djSa//FBmlg58D3xCMseJlBTcspZMHLqaNQeGtK0+tH6omv5VE+lshQU8rM8DhNe9W4DKqleIHquyA4esyoteaSjj5dWRvbB+sKCS8Cni/wVogQSLddT1idzAn3t9XIcq+AJ4yyk22t5CURWlDcwa6rdGbApGKc26L2dW9+IDDIcyE+hUbaqcuhQjFvI5gy6M+7t5dlOiX6hUrAr7qpA29cdrJClx7MNKW2W3AKBZ9UbbUcD6RLkcElnDBzu6gHOIpJ9t6Jj09szJRDL0Wti8EpXkzfIHNNWP9AhyUY7NA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRRRV-0005UR-Ve for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2024 02:41:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Dec 2024 07:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74881 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 74881-submit@debbugs.gnu.org id=B74881.173537162721054 (code B ref 74881); Sat, 28 Dec 2024 07:41:01 +0000 Original-Received: (at 74881) by debbugs.gnu.org; 28 Dec 2024 07:40:27 +0000 Original-Received: from localhost ([127.0.0.1]:48603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRRQw-0005TV-Od for submit@debbugs.gnu.org; Sat, 28 Dec 2024 02:40:27 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:33522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRRQv-0005TK-Jc for 74881@debbugs.gnu.org; Sat, 28 Dec 2024 02:40:26 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRROl-000168-0W; Sat, 28 Dec 2024 02:38:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=39hBrNTX3A5EsOfYKI5pTRc0fz8rbF6qd7PuDH7xe8w=; b=XRCd1GMRq34s Se2YUNAKOfmALtiCc5xpCTEurGrvJO4gX06q5lHMu3J1/YttXqhM8XHShMP1XEG/mceEfSo1BhsYT TWwEpKtc2WgbgMIwSMfSiBoRbpomJjzJA2206pLM1F2j7ghW87XggaABa0986C6jxGkJW0OwTYX0E r2LNAoASWJCi1fXJpkJA0RcUQrsXGPr0B+SXLeUZK+FDq+s7j3acsNeCt5O9AcJ8KIAP/BJpOEhzf MGV/xfePj5PK/Y52qaYivxQHlF6Cy46KbB/hMASU1jcs3cVdxPgLExNv0yilfTV2Gyg/qpRCaF3Xf fgeOzSQVDL9OgxT34fBAdQ==; In-Reply-To: (message from Lin Sun on Fri, 27 Dec 2024 17:34:31 +0000) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:297853 Archived-At: > From: Lin Sun > CC: "74881@debbugs.gnu.org" <74881@debbugs.gnu.org> > Date: Fri, 27 Dec 2024 17:34:31 +0000 > > > From: Eli Zaretskii > > Yes, probably. For a good measure, I'd also bind inhibit-interaction > > to a non-nil value, to make sure we never ever ask the user anything > > inside ediff-delete-temp-files. > > Sure, that's will be more reliable. I had attached the modified patch, please help review again. Thank you ! > > From 39b23f1b3f3d58569b7fa4742e8fd24e2cc7071f Mon Sep 17 00:00:00 2001 > From: Lin Sun > Date: Sun, 15 Dec 2024 06:52:17 +0000 > Subject: [PATCH] * lisp/vc/ediff-util.el: Remove temp files on kill-emacs > > --- > lisp/vc/ediff-util.el | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el > index 6038f3eae30..e46dc70218b 100644 > --- a/lisp/vc/ediff-util.el > +++ b/lisp/vc/ediff-util.el > @@ -213,6 +213,14 @@ ediff-setup-keymap > (fset 'ediff-mode-map ediff-mode-map) > (run-hooks 'ediff-keymap-setup-hook)) > > +(defun ediff--delete-temp-files-on-kill-emacs () > + "Delete the temp-files associated with the ediff buffers." > + (let ((inhibit-interaction nil)) ^^^ This should be t, not nil.