summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-11 14:30:07 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-11 14:30:07 -0400
commit37ac18a341f604b6ebf27af8effc7ef73e2a28ea (patch)
tree2d66b3afb31deff84e67950478a56a81101f59fd /lisp/shell.el
parentd562d7a44cf4abe2ea23ee6fc2982a1e41bc27fb (diff)
downloademacs-37ac18a341f604b6ebf27af8effc7ef73e2a28ea.tar.gz
Change modes that used same-window-* vars to use switch-to-buffer.
* cmuscheme.el (run-scheme, switch-to-scheme): * ielm.el (ielm): * shell.el (shell): * net/rlogin.el (rlogin): * net/telnet.el (telnet, rsh): * progmodes/inf-lisp.el (inferior-lisp): Use switch-to-buffer. * cus-edit.el (customize-group, custom-buffer-create) (customize-browse, custom-buffer-create-other-window): Use switch-to-buffer or switch-to-buffer-other-window. * info.el (info, Info-find-node, Info-revert-find-node, Info-next) (Info-prev, Info-up, Info-speedbar-goto-node) (info-display-manual): Use switch-to-buffer. (Info-speedbar-goto-node): Use switch-to-buffer-other-frame. * lisp/gnus/message.el (message-pop-to-buffer): Default to switch-to-buffer. (message-mail-other-window, message-mail-other-frame) (message-news-other-window, message-news-other-frame): Use switch-to-buffer-other-frame and switch-to-buffer-other-window instead of setting buffer display varibles. * mail/sendmail.el (mail): Use switch-to-buffer. (mail-recover): Use switch-to-buffer-other-window. * progmodes/gdb-mi.el (gdb-restore-windows, gdb-setup-windows): Use switch-to-buffer.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 3e06801e7af..8c5781f9333 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -650,9 +650,9 @@ Otherwise, one argument `-i' is passed to the shell.
t shell-file-name))
'localname))))
- ;; Pop to buffer, so that the buffer's window will be correctly set
- ;; when we call comint (so that comint sets the COLUMNS env var properly).
- (pop-to-buffer buffer)
+ ;; The buffer's window must be correctly set when we call comint (so
+ ;; that comint sets the COLUMNS env var properly).
+ (switch-to-buffer buffer)
(unless (comint-check-proc buffer)
(let* ((prog (or explicit-shell-file-name
(getenv "ESHELL") shell-file-name))