master c9be6f731de 2/3: ; Fix last change

[Eli Zaretskii]

branch: master
commit c9be6f731de12b1c9eda0c51e188953e56ba0767
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Fix last change
    
    * lisp/vc/ediff-util.el (ediff--delete-temp-files-on-kill-emacs):
    Add commentary explaining the precautions.  (Bug#74881)
---
 lisp/vc/ediff-util.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 87d6f7c4aec..33666535843 100644
--- 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))