[Emacs-diffs] master 7af6c87: Prevent to apply funcall on t

[Tino Calancha]

branch: master
commit 7af6c87b5047c5362cb57c6173d27fe877597c04
Author: Stefan Monnier <address@hidden>
Commit: Tino Calancha <address@hidden>

    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 a6b88d5..99672fc 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))