summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-10 14:52:37 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-10 14:52:37 -0400
commit8319e0bf55c9058f723ed150605d4614f79b0d5e (patch)
treeff7b8bc95b7f006914077712737163defd061f70 /lisp/shell.el
parent3134906c9184b5b525d1b2f3251dcbd0c3c6ab71 (diff)
downloademacs-8319e0bf55c9058f723ed150605d4614f79b0d5e.tar.gz
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/shell.el')
-rw-r--r--lisp/shell.el3
1 files changed, 0 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 909ebb48afc..3e06801e7af 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -669,9 +669,6 @@ Otherwise, one argument `-i' is passed to the shell.
(shell-mode)))
buffer)
-;; Don't do this when shell.el is loaded, only while dumping.
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*shell*"))
-
;;; Directory tracking
;;
;; This code provides the shell mode input sentinel