diff options
| author | Dmitry Antipov | 2013-08-05 14:35:55 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-05 14:35:55 +0400 |
| commit | 12b4c0ea03a8c7905254be1cefa234bc8d8a8a88 (patch) | |
| tree | a80fd7a077d1cca4b01e757b4dc7641dfe41efb8 /lisp/term | |
| parent | e412eb97cc4e1f9edb1118163f09a77ab9925704 (diff) | |
| download | emacs-12b4c0ea03a8c7905254be1cefa234bc8d8a8a88.tar.gz emacs-12b4c0ea03a8c7905254be1cefa234bc8d8a8a88.zip | |
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.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/xterm.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 86f4583b987..af0b0b606e5 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -606,7 +606,7 @@ We run the first FUNCTION whose STRING matches the input events." | |||
| 606 | (add-hook 'delete-terminal-functions 'xterm-remove-modify-other-keys) | 606 | (add-hook 'delete-terminal-functions 'xterm-remove-modify-other-keys) |
| 607 | ;; Add the selected frame to the list of frames that | 607 | ;; Add the selected frame to the list of frames that |
| 608 | ;; need to deal with modify-other-keys. | 608 | ;; need to deal with modify-other-keys. |
| 609 | (push (frame-terminal (selected-frame)) | 609 | (push (frame-terminal) |
| 610 | xterm-modify-other-keys-terminal-list) | 610 | xterm-modify-other-keys-terminal-list) |
| 611 | (xterm-turn-on-modify-other-keys)) | 611 | (xterm-turn-on-modify-other-keys)) |
| 612 | 612 | ||
| @@ -728,7 +728,7 @@ versions of xterm." | |||
| 728 | 728 | ||
| 729 | (defun xterm-turn-on-modify-other-keys () | 729 | (defun xterm-turn-on-modify-other-keys () |
| 730 | "Turn the modifyOtherKeys feature of xterm back on." | 730 | "Turn the modifyOtherKeys feature of xterm back on." |
| 731 | (let ((terminal (frame-terminal (selected-frame)))) | 731 | (let ((terminal (frame-terminal))) |
| 732 | (when (and (terminal-live-p terminal) | 732 | (when (and (terminal-live-p terminal) |
| 733 | (memq terminal xterm-modify-other-keys-terminal-list)) | 733 | (memq terminal xterm-modify-other-keys-terminal-list)) |
| 734 | (send-string-to-terminal "\e[>4;1m" terminal)))) | 734 | (send-string-to-terminal "\e[>4;1m" terminal)))) |
| @@ -742,7 +742,7 @@ versions of xterm." | |||
| 742 | 742 | ||
| 743 | (defun xterm-remove-modify-other-keys (&optional terminal) | 743 | (defun xterm-remove-modify-other-keys (&optional terminal) |
| 744 | "Turn off the modifyOtherKeys feature of xterm for good." | 744 | "Turn off the modifyOtherKeys feature of xterm for good." |
| 745 | (setq terminal (or terminal (frame-terminal (selected-frame)))) | 745 | (setq terminal (or terminal (frame-terminal))) |
| 746 | (when (and (terminal-live-p terminal) | 746 | (when (and (terminal-live-p terminal) |
| 747 | (memq terminal xterm-modify-other-keys-terminal-list)) | 747 | (memq terminal xterm-modify-other-keys-terminal-list)) |
| 748 | (setq xterm-modify-other-keys-terminal-list | 748 | (setq xterm-modify-other-keys-terminal-list |