diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-21 17:43:17 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-21 17:43:17 -0400 |
commit | 9c10436944ee2d27a19bf0220828db5dc4aeca1f (patch) | |
tree | 50746af3320ff1f7451e827b84c900cc4081dde5 /lisp/dframe.el | |
parent | 622eef687cedb8fbaf8ca529239f46968c2487f7 (diff) | |
download | emacs-9c10436944ee2d27a19bf0220828db5dc4aeca1f.tar.gz |
* lisp/dframe.el (dframe-get-focus): Remove `hook' argument.
* lisp/speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.
Fixes: debbugs:17311
Diffstat (limited to 'lisp/dframe.el')
-rw-r--r-- | lisp/dframe.el | 9 |
1 files changed, 3 insertions, 6 deletions
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 () |