* lisp/vc/ediff-util.el: Remove temp Ediff files on kill-emacs

(ediff--delete-temp-files-on-kill-emacs): New function.
(ediff-setup): Install it in 'kill-emacs-hook'.  (Bug#74881)

(cherry picked from commit 2ba49f8a12ea378cc38cd1f0eacd88b6ef7e74e4)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5bd0281e94768a323d78dd88b19117f7e1d04daf..2b5caa76ec7cf525d692bf3a4e41d3d692727bbe 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -213,6 +213,14 @@ to invocation.")
   (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."
+  (ignore-errors
+    (let ((inhibit-interaction t))
+      (dolist (b (buffer-list))
+        (with-current-buffer b
+          (when (eq major-mode 'ediff-mode)
+            (ediff-delete-temp-files)))))))
 
 ;;; Setup functions
 
@@ -488,6 +496,7 @@ to invocation.")
       (if (ediff-buffer-live-p ediff-meta-buffer)
          (ediff-update-meta-buffer
           ediff-meta-buffer nil ediff-meta-session-number))
+      (add-hook 'kill-emacs-hook #'ediff--delete-temp-files-on-kill-emacs)
       (run-hooks 'ediff-startup-hook)
       ) ; eval in control-buffer
     control-buffer))