emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 5fe7f86367c: * lisp/vc/ediff-util.el: Loop the ediff-session-regi


From: Eli Zaretskii
Subject: master 5fe7f86367c: * lisp/vc/ediff-util.el: Loop the ediff-session-registry instead of buffers
Date: Sat, 4 Jan 2025 07:39:14 -0500 (EST)

branch: master
commit 5fe7f86367c95dbc65dfed5acb34f8dca2b40fe9
Author: Lin Sun <sunlin7@hotmail.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    * lisp/vc/ediff-util.el: Loop the ediff-session-registry instead of buffers
    
    This avoids aborting the loop if an error happens in some buffer.
    (Bug#74881)
---
 lisp/vc/ediff-util.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index c4c0e39912a..e07f2c0b2f6 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -219,12 +219,11 @@ to invocation.")
   ;; where this hook could prevent kill-emacs from shutting down Emacs,
   ;; because user interaction is not possible (e.g., in a daemon), or
   ;; if deleting these files signals an error.
-  (ignore-errors
-    (let ((inhibit-interaction t))
-      (dolist (b (buffer-list))
+  (let ((inhibit-interaction t))
+    (dolist (b ediff-session-registry)
+      (ignore-errors
         (with-current-buffer b
-          (when (eq major-mode 'ediff-mode)
-            (ediff-delete-temp-files)))))))
+          (ediff-delete-temp-files))))))
 
 ;;; Setup functions
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]