[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117000: * lisp/dframe.el (dframe-get-focus): Rem
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117000: * lisp/dframe.el (dframe-get-focus): Remove `hook' argument. |
Date: |
Mon, 21 Apr 2014 21:43:22 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117000
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17311
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-04-21 17:43:17 -0400
message:
* lisp/dframe.el (dframe-get-focus): Remove `hook' argument.
* lisp/speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dframe.el dframe.el-20091113204419-o5vbwnq5f7feedwu-3871
lisp/speedbar.el
speedbar.el-20091113204419-o5vbwnq5f7feedwu-1271
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-21 21:18:12 +0000
+++ b/lisp/ChangeLog 2014-04-21 21:43:17 +0000
@@ -1,5 +1,8 @@
2014-04-21 Stefan Monnier <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/dframe.el'
--- a/lisp/dframe.el 2014-02-28 13:19:06 +0000
+++ b/lisp/dframe.el 2014-04-21 21:43:17 +0000
@@ -606,13 +606,12 @@
;;; 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 @@
;; 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 ()
=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el 2014-01-25 19:15:42 +0000
+++ b/lisp/speedbar.el 2014-04-21 21:43:17 +0000
@@ -1076,9 +1076,9 @@
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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117000: * lisp/dframe.el (dframe-get-focus): Remove `hook' argument.,
Stefan Monnier <=