diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-07-12 00:55:04 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2016-07-12 00:55:04 +0900 |
| commit | 7af6c87b5047c5362cb57c6173d27fe877597c04 (patch) | |
| tree | 778d2190c6dd5f16785a21c9137bb30090c782f6 | |
| parent | 713e922243fb60d850f7b0ff83f3e2a3682f1832 (diff) | |
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).
| -rw-r--r-- | lisp/vc/ediff-util.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index a6b88d557b..99672fcb01 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)) |