procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/ediff-util.el: Loop the ediff-session-registry instead of buffers

Browse source 
This avoids aborting the loop if an error happens in some buffer.
(Bug#74881)
This commit is contained in:
Lin Sun 2024-12-29 06:55:01 +00:00 • committed by Eli Zaretskii
parent 742b792175
commit 5fe7f86367
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/ediff-util.el
View file

@ -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