From 9c10436944ee2d27a19bf0220828db5dc4aeca1f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 21 Apr 2014 17:43:17 -0400 Subject: [PATCH] * lisp/dframe.el (dframe-get-focus): Remove `hook' argument. * lisp/speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead. Fixes: debbugs:17311 --- lisp/ChangeLog | 3 +++ lisp/dframe.el | 9 +++------ lisp/speedbar.el | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d25bf4b7597..169e6bce49d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-04-21 Stefan Monnier + * dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311). + * speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead. + * emacs-lisp/cl-macs.el (cl--loop-let): Avoid `nil' as var name. 2014-04-21 Michael Albinus diff --git a/lisp/dframe.el b/lisp/dframe.el index 872b922d783..90edacbf416 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -606,13 +606,12 @@ Argument E is the event deleting the frame." ;;; Utilities ;; -(defun dframe-get-focus (frame-var activator &optional hook) +(defun dframe-get-focus (frame-var activator) "Change frame focus to or from a dedicated frame. If the selected frame is not in the symbol FRAME-VAR, then FRAME-VAR frame is selected. If the FRAME-VAR is active, then select the attached frame. If FRAME-VAR is nil, ACTIVATOR is called to -created it. HOOK is an optional hook to run when -selecting FRAME-VAR." +created it." (interactive) (if (eq (selected-frame) (symbol-value frame-var)) (if (frame-live-p dframe-attached-frame) @@ -623,9 +622,7 @@ selecting FRAME-VAR." ;; go there (select-frame (symbol-value frame-var)) ) - (other-frame 0) - ;; If updates are off, then refresh the frame (they want it now...) - (run-hooks hook)) + (other-frame 0)) (defun dframe-close-frame () diff --git a/lisp/speedbar.el b/lisp/speedbar.el index c425d777306..084767893e4 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -1076,9 +1076,9 @@ If the selected frame is not speedbar, then speedbar frame is selected. If the speedbar frame is active, then select the attached frame." (interactive) (speedbar-reset-scanners) - (dframe-get-focus 'speedbar-frame 'speedbar-frame-mode - (lambda () (let ((speedbar-update-flag t)) - (speedbar-timer-fn))))) + (dframe-get-focus 'speedbar-frame 'speedbar-frame-mode) + (let ((speedbar-update-flag t)) + (speedbar-timer-fn))) (defsubst speedbar-frame-width () "Return the width of the speedbar frame in characters. -- 2.39.5