Remove temp files /tmp/fineDiff* for kill-emacs without quit ediff

core/core-versions.el

@@ -27,4 +27,15 @@
 (defconst spacemacs-version          "0.999.0" "Spacemacs version.")
 (defconst spacemacs-emacs-min-version   "28.2" "Minimal version of Emacs.")
 
+(defmacro spacemacs/block-before-emacs-min-version (version msg &rest body)
+  "Apply the BODY if `spacemacs-emacs-min-version' < VERSION, otherwise
+warn the MSG."
+  (declare (indent 1))
+  `(if (version< spacemacs-emacs-min-version ,version)
+       (progn ,@body)
+     (apply 'warn
+            (if ,msg '("%s" ,msg)
+              '("Minimum emacs version %s is newer than supported version %s"
+                ,version spacemacs-emacs-min-version)))))
+
 (provide 'core-versions)

layers/+spacemacs/spacemacs-defaults/funcs.el

@@ -940,6 +940,17 @@ variable."
   (ediff-files (dotspacemacs/location)
                (concat dotspacemacs-template-directory ".spacemacs.template")))
 
+(spacemacs/block-before-emacs-min-version "31.0.50"
+  "Use builtin `ediff--delete-temp-files-on-kill-emacs' first"
+
+  (defun spacemacs//ediff-delete-temp-files ()
+    "Delete the temp-files associated with the ediff buffers."
+    (let ((inhibit-interaction t))
+      (dolist (b ediff-session-registry)
+        (ignore-errors
+          (with-current-buffer b
+            (ediff-delete-temp-files)))))))
+
 (defun spacemacs/new-empty-buffer (&optional split)
   "Create a new buffer called: \"untitled\".
 

layers/+spacemacs/spacemacs-defaults/packages.el

@@ -211,7 +211,9 @@
     (require 'outline)
     (add-hook 'ediff-prepare-buffer-hook #'show-all)
     ;; restore window layout when done
-    (add-hook 'ediff-quit-hook #'winner-undo)))
+    (add-hook 'ediff-quit-hook #'winner-undo)
+    (when (fboundp 'spacemacs//ediff-delete-temp-files)
+      (add-hook 'kill-emacs-hook #'spacemacs//ediff-delete-temp-files))))
 
 (defun spacemacs-defaults/init-eldoc ()
   (use-package eldoc