mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

* lisp/shell.el (shell): Use current-buffer by default if it's already

Browse Source 
a shell mode buffer and its process is dead.  Suggested by <jemarch@gnu.org>.
This commit is contained in:
Stefan Monnier 2010-11-23 09:19:54 -05:00
parent a299480856
commit 8f5f1e686e
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ChangeLog
View File

@ -1,7 +1,13 @@
2010-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
* shell.el (shell): Use current-buffer by default if it's already
a shell mode buffer and its process is dead.
Suggested by <jemarch@gnu.org>.
2010-11-23 Tassilo Horn <tassilo@member.fsf.org>
* mail/emacsbug.el (report-emacs-bug-query-existing-bugs): Mention
that the keywords should be comma separated.
* mail/emacsbug.el (report-emacs-bug-query-existing-bugs):
Mention that the keywords should be comma separated.
2010-11-23 Chong Yidong <cyd@stupidchicken.com>

8
lisp/shell.el
View File

@ -554,13 +554,19 @@ Otherwise, one argument `-i' is passed to the shell.
(generate-new-buffer-name "*shell*"))
(if (file-remote-p default-directory)
;; It must be possible to declare a local default-directory.
;; FIXME: This can't be right: it changes the default-directory
;; of the current-buffer rather than of the *shell* buffer.
(setq default-directory
(expand-file-name
(read-file-name
"Default directory: " default-directory default-directory
t nil 'file-directory-p))))))))
(require 'ansi-color)
(setq buffer (get-buffer-create (or buffer "*shell*")))
(setq buffer (if (or buffer (not (derived-mode-p 'shell-mode))
(comint-check-proc (current-buffer)))
(get-buffer-create (or buffer "*shell*"))
;; If the current buffer is a dead shell buffer, use it.
(current-buffer)))
;; 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)