; Fix last change

* lisp/vc/ediff-util.el (ediff--delete-temp-files-on-kill-emacs):
Add commentary explaining the precautions.  (Bug#74881)

(cherry picked from commit c9be6f731de12b1c9eda0c51e188953e56ba0767)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 2b5caa76ec7cf525d692bf3a4e41d3d692727bbe..a2ff65b875ece6fcc19686a6656f25778d6e13d5 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -215,6 +215,10 @@ to invocation.")
 
 (defun ediff--delete-temp-files-on-kill-emacs ()
   "Delete the temp-files associated with the ediff buffers."
+  ;; We inhibit interaction and ignore any errors to avoid the situation
+  ;; 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))