summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--lisp/shell.el11
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 1d1ba11ef6f..f0b413aa6a2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30 Glenn Morris <rgm@gnu.org>
+
+ * misc.texi (Directory Tracking): Explain a bit more about
+ dirtrack-mode.
+
2007-10-25 Glenn Morris <rgm@gnu.org>
* fortran-xtra.texi (Fortran): F90 mode handles F2003.
diff --git a/lisp/shell.el b/lisp/shell.el
index 5089e75409b..24ef65a384a 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -259,7 +259,8 @@ This mirrors the optional behavior of tcsh."
(defcustom shell-dirtrack-verbose t
"If non-nil, show the directory stack following directory change.
This is effective only if directory tracking is enabled.
-The `dirtrack' package provides an alternative implementation of this feature."
+The `dirtrack' package provides an alternative implementation of this feature -
+see the function `dirtrack-mode'."
:type 'boolean
:group 'shell-directories)
@@ -396,7 +397,7 @@ by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field.
directory stack is.
\\[shell-dirtrack-mode] turns directory tracking on and off.
\(The `dirtrack' package provides an alternative implementation of this
-feature.)
+feature - see the function `dirtrack-mode'.)
\\{shell-mode-map}
Customization: Entry to this mode runs the hooks on `comint-mode-hook' and
@@ -626,6 +627,8 @@ default directory to track these commands.
You may toggle this tracking on and off with \\[shell-dirtrack-mode].
If Emacs gets confused, you can resync with the shell with \\[dirs].
+\(The `dirtrack' package provides an alternative implementation of this
+feature - see the function `dirtrack-mode'.)
See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp',
and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract',
@@ -781,7 +784,9 @@ Environment variables are expanded, see function `substitute-in-file-name'."
(defvaralias 'shell-dirtrack-mode 'shell-dirtrackp)
(define-minor-mode shell-dirtrack-mode
- "Turn directory tracking on and off in a shell buffer."
+ "Turn directory tracking on and off in a shell buffer.
+The `dirtrack' package provides an alternative implementation of this
+feature - see the function `dirtrack-mode'."
nil nil nil
(setq list-buffers-directory (if shell-dirtrack-mode default-directory))
(if shell-dirtrack-mode