Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-294
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-295
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-296
   Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * emacs@sv.gnu.org/emacs--devo--0--patch-297
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-298
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-299
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-300
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-301
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-302
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-303
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-304
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-103
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-104
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/shell.el b/lisp/shell.el
index bfa9565e8d4..6b22ac79238 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -367,7 +367,7 @@ Thus, this does not include the shell's current directory.")
 (put 'shell-mode 'mode-class 'special)
 
 (define-derived-mode shell-mode comint-mode "Shell"
-  "Major mode for interacting with an inferior shell.
+  "Major mode for interacting with an inferior shell.\\<shell-mode-map>
 \\[comint-send-input] after the end of the process' output sends the text from
     the end of process to the end of the current line.
 \\[comint-send-input] before end of process output copies the current line minus the prompt to
@@ -433,11 +433,11 @@ buffer."
   (setq shell-dirstack nil)
   (make-local-variable 'shell-last-dir)
   (setq shell-last-dir nil)
-  (shell-dirtrack-mode 1)
   (setq comint-input-autoexpand shell-input-autoexpand)
   ;; This is not really correct, since the shell buffer does not really
   ;; edit this directory.  But it is useful in the buffer list and menus.
   (make-local-variable 'list-buffers-directory)
+  (shell-dirtrack-mode 1)
   (setq list-buffers-directory (expand-file-name default-directory))
   ;; shell-dependent assignments.
   (when (ring-empty-p comint-input-ring)