(shell-dirtrack-verbose, shell-mode)

(shell-directory-tracker, shell-dirtrack-mode): Doc fix.
(dirtrack-toggle, dirtrack-mode): No longer alias to
shell-dirtrack-mode.

2 files changed, 20 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a09ef67b8ea..b26216ab59d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * shell.el (shell-dirtrack-verbose, shell-mode)
+        (shell-directory-tracker, shell-dirtrack-mode): Doc fix.
+        (dirtrack-toggle, dirtrack-mode): No longer alias to
+        shell-dirtrack-mode.
+
 2008-01-10  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * international/mule-cmds.el (select-safe-coding-system):
diff --git a/lisp/shell.el b/lisp/shell.el
index 5cc4862c891..45ef23e98c3 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -93,7 +93,7 @@
 ;; m-c-f   shell-forward-command        Forward a shell command
 ;; m-c-b   shell-backward-command       Backward a shell command
 ;;         dirs                         Resync the buffer's dir stack
-;;         dirtrack-mode                Turn dir tracking on/off
+;;         shell-dirtrack-mode          Turn dir tracking on/off
 ;;         comint-strip-ctrl-m          Remove trailing ^Ms from output
 ;;
 ;; The shell mode hook is shell-mode-hook
@@ -263,7 +263,9 @@ 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."
+This is effective only if directory tracking is enabled.
+The `dirtrack' package provides an alternative implementation of this feature -
+see the function `dirtrack-mode'."
   :type 'boolean
   :group 'shell-directories)
 
@@ -398,7 +400,9 @@ While directory tracking is enabled, the shell's working directory is displayed
 by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field.
 \\[dirs] queries the shell and resyncs Emacs' idea of what the current
     directory stack is.
-\\[dirtrack-mode] turns directory tracking on and off.
+\\[shell-dirtrack-mode] turns directory tracking on and off.
+\(The `dirtrack' package provides an alternative implementation of this
+feature.)
 
 \\{shell-mode-map}
 Customization: Entry to this mode runs the hooks on `comint-mode-hook' and
@@ -615,8 +619,10 @@ This function is called on each input passed to the shell.
 It watches for cd, pushd and popd commands and sets the buffer's
 default directory to track these commands.
 
-You may toggle this tracking on and off with \\[dirtrack-mode].
+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',
@@ -772,7 +778,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
@@ -781,8 +789,6 @@ Environment variables are expanded, see function `substitute-in-file-name'."
 
 ;; For your typing convenience:
 (defalias 'shell-dirtrack-toggle 'shell-dirtrack-mode) ;??Convenience??
-(defalias 'dirtrack-toggle 'shell-dirtrack-mode)
-(defalias 'dirtrack-mode 'shell-dirtrack-mode)
 
 (defun shell-cd (dir)
   "Do normal `cd' to DIR, and set `list-buffers-directory'."