From: Lin Sun <sunlin7@hotmail.com>
Date: Sun, 29 Dec 2024 06:55:01 +0000 (+0000)
Subject: * lisp/vc/ediff-util.el: Loop the ediff-session-registry instead of buffers
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f268dc568e89cec18430a254456c130a2da0265f;p=emacs.git

* 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)

(cherry picked from commit 5fe7f86367c95dbc65dfed5acb34f8dca2b40fe9)
---

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 80247711ebd..6064b581602 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