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).

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index a6b88d557bad9133e023afd9376e184e036b8440..99672fcb012f12d67d69fdc8c2e0c7794dae0a86 100644 (file)
--- 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)
   ;; 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))
        (session-number ediff-meta-session-number)
        ;; suitable working frame
        (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))