From 7af6c87b5047c5362cb57c6173d27fe877597c04 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Jul 2016 00:55:04 +0900 Subject: [PATCH] Prevent to apply funcall on t * lisp/vc/ediff-util.el (ediff-really-quit): Ignore the global part of 'ediff-after-quit-hook-internal' hook (Bug#23933). --- lisp/vc/ediff-util.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index a6b88d557ba..99672fcb012 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -2439,7 +2439,9 @@ temporarily reverses the meaning of this variable." ;; restore buffer mode line id's in buffer-A/B/C (let ((control-buffer ediff-control-buffer) (meta-buffer ediff-meta-buffer) - (after-quit-hook-internal ediff-after-quit-hook-internal) + ;; FIXME: Here we ignore the global part of the + ;; ediff-after-quit-hook-internal hook. + (after-quit-hook-internal (remq t ediff-after-quit-hook-internal)) (session-number ediff-meta-session-number) ;; suitable working frame (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t)) -- 2.39.5