* lisp/dframe.el (dframe-get-focus): Remove `hook' argument.

* lisp/speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.

Fixes: debbugs:17311

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d25bf4b75979f6afb78d9ff8ac65a324c5f5c33b..169e6bce49dfc76be7cbf7c669de791263995f6d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * 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  <michael.albinus@gmx.de>

diff --git a/lisp/dframe.el b/lisp/dframe.el
index 872b922d783ad1b0a4d71d4730680e12b3f76f84..90edacbf416626ce8c9ce56b674626d859a7afd6 100644 (file)
--- 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 c425d7773066c945c88573f3bb0a3c08b1c25a70..084767893e4aed122045e52df02b560023e4551e 100644 (file)
--- 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.