Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Fixes: debbugs:17311
This commit is contained in:
Stefan Monnier 2014-04-21 17:43:17 -04:00
parent 622eef687c
commit 9c10436944
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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>

9
lisp/dframe.el
View file

@ -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 ()

6
lisp/speedbar.el
View file

@ -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.