branch: elpa/magit
commit d38ce154fba8e113b83ea1c982cd2a9b66c116c5
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-ediff-resolve-rest: Restore call to cleanup function on quit
That was accidentally dropped in [1: ad79d46df], when the function
that kills auxiliary buffers was removed from the global value of
`magit-ediff-quit-hook' and replaced with a function that is added
to the local value of that hook, by `magit-ediff-buffers'.
`magit-ediff-resolve-rest' does not use `magit-ediff-buffers', so
for that, auxiliary buffers were no longer being cleaned up.
---
lisp/magit-ediff.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 4900cf26f5..0ac2e745e7 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -229,6 +229,7 @@ and alternative commands."
(when (buffer-live-p ediff-ancestor-buffer)
(kill-buffer ediff-ancestor-buffer)))
t t)
+ (add-hook 'ediff-quit-hook #'magit-ediff--cleanup-buffers t t)
(add-hook 'ediff-quit-hook
(lambda ()
(let ((magit-ediff-previous-winconf winconf))
