diff options
| author | Glenn Morris | 2007-10-30 06:39:00 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-10-30 06:39:00 +0000 |
| commit | c004e539dc15e71b9d0daeaa4741b6ea767f8e1f (patch) | |
| tree | f6a0f3bd5a4ccea88e4a86eac7391bd2eddda8f6 | |
| parent | 5b549c31a7863fb45ff175879337d14059a5ddbe (diff) | |
| download | emacs-c004e539dc15e71b9d0daeaa4741b6ea767f8e1f.tar.gz emacs-c004e539dc15e71b9d0daeaa4741b6ea767f8e1f.zip | |
(shell-dirtrack-verbose, shell-mode, shell-directory-tracker)
(shell-dirtrack-mode): Doc fix.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/shell.el | 11 |
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 @@ | |||
| 1 | 2007-10-30 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * misc.texi (Directory Tracking): Explain a bit more about | ||
| 4 | dirtrack-mode. | ||
| 5 | |||
| 1 | 2007-10-25 Glenn Morris <rgm@gnu.org> | 6 | 2007-10-25 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * fortran-xtra.texi (Fortran): F90 mode handles F2003. | 8 | * 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." | |||
| 259 | (defcustom shell-dirtrack-verbose t | 259 | (defcustom shell-dirtrack-verbose t |
| 260 | "If non-nil, show the directory stack following directory change. | 260 | "If non-nil, show the directory stack following directory change. |
| 261 | This is effective only if directory tracking is enabled. | 261 | This is effective only if directory tracking is enabled. |
| 262 | The `dirtrack' package provides an alternative implementation of this feature." | 262 | The `dirtrack' package provides an alternative implementation of this feature - |
| 263 | see the function `dirtrack-mode'." | ||
| 263 | :type 'boolean | 264 | :type 'boolean |
| 264 | :group 'shell-directories) | 265 | :group 'shell-directories) |
| 265 | 266 | ||
| @@ -396,7 +397,7 @@ by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field. | |||
| 396 | directory stack is. | 397 | directory stack is. |
| 397 | \\[shell-dirtrack-mode] turns directory tracking on and off. | 398 | \\[shell-dirtrack-mode] turns directory tracking on and off. |
| 398 | \(The `dirtrack' package provides an alternative implementation of this | 399 | \(The `dirtrack' package provides an alternative implementation of this |
| 399 | feature.) | 400 | feature - see the function `dirtrack-mode'.) |
| 400 | 401 | ||
| 401 | \\{shell-mode-map} | 402 | \\{shell-mode-map} |
| 402 | Customization: Entry to this mode runs the hooks on `comint-mode-hook' and | 403 | Customization: Entry to this mode runs the hooks on `comint-mode-hook' and |
| @@ -626,6 +627,8 @@ default directory to track these commands. | |||
| 626 | 627 | ||
| 627 | You may toggle this tracking on and off with \\[shell-dirtrack-mode]. | 628 | You may toggle this tracking on and off with \\[shell-dirtrack-mode]. |
| 628 | If Emacs gets confused, you can resync with the shell with \\[dirs]. | 629 | If Emacs gets confused, you can resync with the shell with \\[dirs]. |
| 630 | \(The `dirtrack' package provides an alternative implementation of this | ||
| 631 | feature - see the function `dirtrack-mode'.) | ||
| 629 | 632 | ||
| 630 | See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', | 633 | See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', |
| 631 | and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', | 634 | 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'." | |||
| 781 | 784 | ||
| 782 | (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) | 785 | (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) |
| 783 | (define-minor-mode shell-dirtrack-mode | 786 | (define-minor-mode shell-dirtrack-mode |
| 784 | "Turn directory tracking on and off in a shell buffer." | 787 | "Turn directory tracking on and off in a shell buffer. |
| 788 | The `dirtrack' package provides an alternative implementation of this | ||
| 789 | feature - see the function `dirtrack-mode'." | ||
| 785 | nil nil nil | 790 | nil nil nil |
| 786 | (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) | 791 | (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) |
| 787 | (if shell-dirtrack-mode | 792 | (if shell-dirtrack-mode |