diff options
| author | Chong Yidong <[email protected]> | 2011-09-10 14:52:37 -0400 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2011-09-10 14:52:37 -0400 |
| commit | 8319e0bf55c9058f723ed150605d4614f79b0d5e (patch) | |
| tree | ff7b8bc95b7f006914077712737163defd061f70 /lisp/net | |
| parent | 3134906c9184b5b525d1b2f3251dcbd0c3c6ab71 (diff) | |
Tweaks to display-buffer default actions; remove same-window-* autoload forms.
* lisp/window.el (display-buffer-alist): Add entry for buffers
previously handled same-window-*.
(display-buffer-alist, display-buffer-default-action)
(display-buffer-overriding-action): Mark as risky.
(display-buffer-alist): Document action function changes.
(display-buffer--same-window-action)
(display-buffer--other-frame-action): New variables.
(switch-to-buffer, display-buffer-other-frame): Use them.
(display-buffer): Rename reuse-frame entry to reusable-frames.
(display-buffer-reuse-selected-window): Function deleted.
(display-buffer-reuse-window): Handle reusable-frames alist entry.
If it's omitted, check pop-up-frames/display-buffer-reuse-frames.
(display-buffer-special): New function.
(display-buffer--maybe-pop-up-frame-or-window): Rename from
display-buffer-reuse-or-pop-window. Split off special-display
part into display-buffer-special.
(display-buffer-use-some-window): Don't perform any special
pop-up-frames handling.
(pop-to-buffer): Use window-normalize-buffer-to-switch-to.
* lisp/cmuscheme.el:
* lisp/ielm.el:
* lisp/shell.el:
* lisp/mail/sendmail.el:
* lisp/progmodes/inf-lisp.el: Don't set same-window-buffer-names.
* lisp/cus-edit.el:
* lisp/info.el:
* lisp/net/rlogin.el:
* lisp/net/telnet.el:
* lisp/progmodes/gud.el: Don't set same-window-regexps.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/rlogin.el | 2 | ||||
| -rw-r--r-- | lisp/net/telnet.el | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index e2619e3bf7..01e66259ad 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -125,8 +125,6 @@ this variable is set from that." -;;;###autoload (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")) - (defvar rlogin-history nil) ;;;###autoload diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index d4850fed34..67971d080f 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -190,8 +190,6 @@ rejecting one login and prompting again for a username and password.") (delete-region comint-last-input-start comint-last-input-end))) -;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")) - ;;;###autoload (defun telnet (host &optional port) "Open a network login connection to host named HOST (a string). @@ -246,8 +244,6 @@ Data is sent to the remote host when RET is typed." (set (make-local-variable 'comint-prompt-regexp) telnet-prompt-pattern) (set (make-local-variable 'comint-use-prompt-regexp) t)) -;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*rsh-[^-]*\\*\\(\\|<[0-9]*>\\)")) - ;;;###autoload (defun rsh (host) "Open a network login connection to host named HOST (a string). |