[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113700: Do not call to `selected-frame' where it is
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r113700: Do not call to `selected-frame' where it is assumed by default. |
Date: |
Mon, 05 Aug 2013 10:36:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113700
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-05 14:35:55 +0400
message:
Do not call to `selected-frame' where it is assumed by default.
Affected functions are `raise-frame', `redraw-frame',
`frame-first-window', `frame-terminal' and `delete-frame'.
* lisp/calendar/appt.el (appt-disp-window):
* lisp/epg.el (epg-wait-for-completion):
* lisp/follow.el (follow-delete-other-windows-and-split)
(follow-avoid-tail-recenter):
* lisp/international/mule.el (set-terminal-coding-system):
* lisp/mail/rmail.el (rmail-mail-return):
* lisp/net/newst-plainview.el (newsticker--buffer-set-uptodate):
* lisp/progmodes/f90.el (f90-add-imenu-menu):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar-toggle):
* lisp/server.el (server-switch-buffer):
* lisp/simple.el (delete-completion-window):
* lisp/talk.el (talk):
* lisp/term/xterm.el (terminal-init-xterm-modify-other-keys)
(xterm-turn-on-modify-other-keys, xterm-remove-modify-other-keys):
* lisp/vc/ediff-util.el (ediff-status-info, ediff-show-diff-output):
* lisp/vc/ediff.el (ediff-documentation): Related users changed.
* lisp/frame.el (selected-terminal): Remove the leftover.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calendar/appt.el appt.el-20091113204419-o5vbwnq5f7feedwu-187
lisp/epg.el epg.el-20091113204419-o5vbwnq5f7feedwu-8560
lisp/follow.el follow.el-20091113204419-o5vbwnq5f7feedwu-966
lisp/frame.el frame.el-20091113204419-o5vbwnq5f7feedwu-275
lisp/international/mule.el mule.el-20091113204419-o5vbwnq5f7feedwu-1046
lisp/mail/rmail.el rmail.el-20091113204419-o5vbwnq5f7feedwu-8812
lisp/net/newst-plainview.el
newstplainview.el-20091113204419-o5vbwnq5f7feedwu-8683
lisp/progmodes/f90.el f90.el-20091113204419-o5vbwnq5f7feedwu-827
lisp/progmodes/idlw-toolbar.el
idlwtoolbar.el-20091113204419-o5vbwnq5f7feedwu-1740
lisp/server.el server.el-20091113204419-o5vbwnq5f7feedwu-107
lisp/simple.el simple.el-20091113204419-o5vbwnq5f7feedwu-403
lisp/talk.el talk.el-20091113204419-o5vbwnq5f7feedwu-874
lisp/term/xterm.el xterm.el-20091113204419-o5vbwnq5f7feedwu-884
lisp/vc/ediff-util.el
ediffutil.el-20091113204419-o5vbwnq5f7feedwu-848
lisp/vc/ediff.el ediff.el-20091113204419-o5vbwnq5f7feedwu-769
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-05 06:54:30 +0000
+++ b/lisp/ChangeLog 2013-08-05 10:35:55 +0000
@@ -1,3 +1,26 @@
+2013-08-05 Dmitry Antipov <address@hidden>
+
+ Do not call to `selected-frame' where it is assumed by default.
+ Affected functions are `raise-frame', `redraw-frame',
+ `frame-first-window', `frame-terminal' and `delete-frame'.
+ * calendar/appt.el (appt-disp-window):
+ * epg.el (epg-wait-for-completion):
+ * follow.el (follow-delete-other-windows-and-split)
+ (follow-avoid-tail-recenter):
+ * international/mule.el (set-terminal-coding-system):
+ * mail/rmail.el (rmail-mail-return):
+ * net/newst-plainview.el (newsticker--buffer-set-uptodate):
+ * progmodes/f90.el (f90-add-imenu-menu):
+ * progmodes/idlw-toolbar.el (idlwave-toolbar-toggle):
+ * server.el (server-switch-buffer):
+ * simple.el (delete-completion-window):
+ * talk.el (talk):
+ * term/xterm.el (terminal-init-xterm-modify-other-keys)
+ (xterm-turn-on-modify-other-keys, xterm-remove-modify-other-keys):
+ * vc/ediff-util.el (ediff-status-info, ediff-show-diff-output):
+ * vc/ediff.el (ediff-documentation): Related users changed.
+ * frame.el (selected-terminal): Remove the leftover.
+
2013-08-05 Glenn Morris <address@hidden>
* calendar/calendar.el (calendar-generate-month):
=== modified file 'lisp/calendar/appt.el'
--- a/lisp/calendar/appt.el 2013-01-01 09:11:05 +0000
+++ b/lisp/calendar/appt.el 2013-08-05 10:35:55 +0000
@@ -472,7 +472,7 @@
(shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf t))
(set-buffer-modified-p nil)
(setq buffer-read-only t)
- (raise-frame (selected-frame))
+ (raise-frame)
(select-window this-window)))
(defun appt-delete-window ()
=== modified file 'lisp/epg.el'
--- a/lisp/epg.el 2013-06-24 07:07:08 +0000
+++ b/lisp/epg.el 2013-08-05 10:35:55 +0000
@@ -1346,7 +1346,7 @@
(> (float-time (or (nth 5 (file-attributes epg-agent-file))
'(0 0 0 0)))
(float-time epg-agent-mtime))))
- (redraw-frame (selected-frame)))
+ (redraw-frame))
(epg-context-set-result-for
context 'error
(nreverse (epg-context-result-for context 'error))))
=== modified file 'lisp/follow.el'
--- a/lisp/follow.el 2013-01-01 09:11:05 +0000
+++ b/lisp/follow.el 2013-08-05 10:35:55 +0000
@@ -572,7 +572,7 @@
(interactive "P")
(let ((other (or (and (null arg)
(not (eq (selected-window)
- (frame-first-window (selected-frame)))))
+ (frame-first-window))))
(and arg
(< (prefix-numeric-value arg) 0))))
(start (window-start)))
@@ -1083,7 +1083,7 @@
This is done by reading and rewriting the start position of
non-first windows in Follow mode."
(let* ((orig-buffer (current-buffer))
- (top (frame-first-window (selected-frame)))
+ (top (frame-first-window))
(win top)
who) ; list of (buffer . frame)
;; If the only window in the frame is a minibuffer
=== modified file 'lisp/frame.el'
--- a/lisp/frame.el 2013-07-29 16:34:53 +0000
+++ b/lisp/frame.el 2013-08-05 10:35:55 +0000
@@ -1278,9 +1278,6 @@
;;;; Frame/display capabilities.
-(defun selected-terminal ()
- "Return the terminal that is now selected."
- (frame-terminal (selected-frame)))
(declare-function msdos-mouse-p "dosfns.c")
=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el 2013-07-20 15:41:38 +0000
+++ b/lisp/international/mule.el 2013-08-05 10:35:55 +0000
@@ -1346,7 +1346,7 @@
(if coding-system
(setq default-terminal-coding-system coding-system))
(set-terminal-coding-system-internal coding-system terminal)
- (redraw-frame (selected-frame)))
+ (redraw-frame))
(defvar default-keyboard-coding-system nil
"Default value of the keyboard coding system.
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2013-05-22 03:13:56 +0000
+++ b/lisp/mail/rmail.el 2013-08-05 10:35:55 +0000
@@ -3725,7 +3725,7 @@
;; If the frame was probably made for this buffer, the user
;; probably wants to delete it now.
((display-multi-frame-p)
- (delete-frame (selected-frame)))
+ (delete-frame))
;; The previous frame is where normally they have the Rmail buffer
;; displayed.
(t (other-frame -1))))
=== modified file 'lisp/net/newst-plainview.el'
--- a/lisp/net/newst-plainview.el 2013-02-12 04:46:18 +0000
+++ b/lisp/net/newst-plainview.el 2013-08-05 10:35:55 +0000
@@ -1188,7 +1188,7 @@
"Redraw the newsticker window."
(if (fboundp 'force-window-update)
(force-window-update (current-buffer))
- (redraw-frame (selected-frame)))
+ (redraw-frame))
(run-hooks 'newsticker-buffer-change-hook)
(sit-for 0))
=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el 2013-05-17 00:36:33 +0000
+++ b/lisp/progmodes/f90.el 2013-08-05 10:35:55 +0000
@@ -1026,7 +1026,7 @@
(if (lookup-key (current-local-map) [menu-bar index])
(message "%s" "F90-imenu already exists.")
(imenu-add-to-menubar "F90-imenu")
- (redraw-frame (selected-frame))))
+ (redraw-frame)))
;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.
=== modified file 'lisp/progmodes/idlw-toolbar.el'
--- a/lisp/progmodes/idlw-toolbar.el 2013-06-25 16:13:49 +0000
+++ b/lisp/progmodes/idlw-toolbar.el 2013-08-05 10:35:55 +0000
@@ -962,7 +962,7 @@
(if (featurep 'xemacs)
nil ; no action necessary, toolbar gets updated automatically
;; On Emacs, redraw the frame to make sure the Toolbar is updated.
- (redraw-frame (selected-frame))))
+ (redraw-frame)))
(provide 'idlw-toolbar)
(provide 'idlwave-toolbar)
=== modified file 'lisp/server.el'
--- a/lisp/server.el 2013-07-31 06:52:26 +0000
+++ b/lisp/server.el 2013-08-05 10:35:55 +0000
@@ -1593,7 +1593,7 @@
(lambda (w)
(and (not (window-dedicated-p w))
(equal (frame-terminal (window-frame w))
- (frame-terminal (selected-frame)))))
+ (frame-terminal))))
'nomini 'visible (selected-window))))
(condition-case nil
(switch-to-buffer next-buffer)
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2013-07-26 18:48:05 +0000
+++ b/lisp/simple.el 2013-08-05 10:35:55 +0000
@@ -6630,7 +6630,7 @@
(let ((buf completion-reference-buffer))
(if (one-window-p t)
(if (window-dedicated-p (selected-window))
- (delete-frame (selected-frame)))
+ (delete-frame))
(delete-window (selected-window))
(if (get-buffer-window buf)
(select-window (get-buffer-window buf))))))
=== modified file 'lisp/talk.el'
--- a/lisp/talk.el 2013-01-01 09:11:05 +0000
+++ b/lisp/talk.el 2013-08-05 10:35:55 +0000
@@ -50,7 +50,7 @@
(let ((type (frame-live-p (selected-frame))))
(if (or (eq type t) (eq type 'x))
(talk-add-display
- (terminal-name (frame-terminal (selected-frame))))
+ (terminal-name (frame-terminal)))
(error "Unknown frame type")))
(talk-update-buffers))
=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el 2013-06-14 18:37:38 +0000
+++ b/lisp/term/xterm.el 2013-08-05 10:35:55 +0000
@@ -606,7 +606,7 @@
(add-hook 'delete-terminal-functions 'xterm-remove-modify-other-keys)
;; Add the selected frame to the list of frames that
;; need to deal with modify-other-keys.
- (push (frame-terminal (selected-frame))
+ (push (frame-terminal)
xterm-modify-other-keys-terminal-list)
(xterm-turn-on-modify-other-keys))
@@ -728,7 +728,7 @@
(defun xterm-turn-on-modify-other-keys ()
"Turn the modifyOtherKeys feature of xterm back on."
- (let ((terminal (frame-terminal (selected-frame))))
+ (let ((terminal (frame-terminal)))
(when (and (terminal-live-p terminal)
(memq terminal xterm-modify-other-keys-terminal-list))
(send-string-to-terminal "\e[>4;1m" terminal))))
@@ -742,7 +742,7 @@
(defun xterm-remove-modify-other-keys (&optional terminal)
"Turn off the modifyOtherKeys feature of xterm for good."
- (setq terminal (or terminal (frame-terminal (selected-frame))))
+ (setq terminal (or terminal (frame-terminal)))
(when (and (terminal-live-p terminal)
(memq terminal xterm-modify-other-keys-terminal-list))
(setq xterm-modify-other-keys-terminal-list
=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el 2013-05-23 07:10:05 +0000
+++ b/lisp/vc/ediff-util.el 2013-08-05 10:35:55 +0000
@@ -2818,7 +2818,7 @@
(with-output-to-temp-buffer ediff-msg-buffer
(ediff-with-current-buffer standard-output
(fundamental-mode))
- (raise-frame (selected-frame))
+ (raise-frame)
(princ (ediff-version))
(princ "\n\n")
(ediff-with-current-buffer ediff-buffer-A
@@ -3468,7 +3468,7 @@
(ediff-with-current-buffer buf
(goto-char (point-min)))
(switch-to-buffer buf)
- (raise-frame (selected-frame)))))
+ (raise-frame))))
(if (frame-live-p ediff-control-frame)
(ediff-reset-mouse ediff-control-frame))
(if (window-live-p ediff-control-window)
=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el 2013-07-07 19:35:54 +0000
+++ b/lisp/vc/ediff.el 2013-08-05 10:35:55 +0000
@@ -1499,7 +1499,7 @@
(if node
(Info-goto-node node)
(message "Type `i' to search for a specific topic"))
- (raise-frame (selected-frame)))
+ (raise-frame))
(error (beep 1)
(with-output-to-temp-buffer ediff-msg-buffer
(ediff-with-current-buffer standard-output
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113700: Do not call to `selected-frame' where it is assumed by default.,
Dmitry Antipov <=