From e7965c6f4f9dcce7f38ab9a51cd2638d5feb5c66 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 18 Dec 2017 20:30:10 -0500 Subject: [PATCH] Don't bind dframe events on load (Bug#29599) * lisp/dframe.el (dframe-set-special-events): New function, containing previous top-level key binding code. (dframe-frame-mode): Use it. --- lisp/dframe.el | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/dframe.el b/lisp/dframe.el index 7f77d8991f..0766bd068d 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -288,6 +288,7 @@ dframe-frame-mode (set frame-var nil)) ;; Set this as our currently attached frame (setq dframe-attached-frame (selected-frame)) + (dframe-set-special-events) (run-hooks popup-hook) ;; Updated the buffer passed in to contain all the hacks needed ;; to make it work well in a dedicated window. @@ -543,16 +544,14 @@ dframe-detach ))) ;;; Special frame event proxies -;; -(if (boundp 'special-event-map) - (progn - (define-key special-event-map [make-frame-visible] - 'dframe-handle-make-frame-visible) - (define-key special-event-map [iconify-frame] - 'dframe-handle-iconify-frame) - (define-key special-event-map [delete-frame] - 'dframe-handle-delete-frame)) - ) +(defun dframe-set-special-events () + (when (boundp 'special-event-map) + (define-key special-event-map [make-frame-visible] + 'dframe-handle-make-frame-visible) + (define-key special-event-map [iconify-frame] + 'dframe-handle-iconify-frame) + (define-key special-event-map [delete-frame] + 'dframe-handle-delete-frame))) (defvar dframe-make-frame-visible-function nil "Function used when a dframe controlled frame is de-iconified. -- 2.11.0