diff options
| author | Paul Eggert | 2011-10-22 23:38:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-22 23:38:24 -0700 |
| commit | cfc09582247ffef6a46b6249e2fba9136a62d21e (patch) | |
| tree | 50e102f64a2b88c692d9110990abd416c78c32f0 /lisp/shell.el | |
| parent | 92c938895c639463681ae1c58a944cae62b70b87 (diff) | |
| parent | 86c606818495d9411fd5d6b1477f9a097eb18020 (diff) | |
| download | emacs-cfc09582247ffef6a46b6249e2fba9136a62d21e.tar.gz emacs-cfc09582247ffef6a46b6249e2fba9136a62d21e.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index cefe42bb3ec..c75594ddbe4 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -890,9 +890,13 @@ Environment variables are expanded, see function `substitute-in-file-name'." | |||
| 890 | 890 | ||
| 891 | (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) | 891 | (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) |
| 892 | (define-minor-mode shell-dirtrack-mode | 892 | (define-minor-mode shell-dirtrack-mode |
| 893 | "Turn directory tracking on and off in a shell buffer. | 893 | "Toggle directory tracking in this shell buffer (Shell Dirtrack mode). |
| 894 | The `dirtrack' package provides an alternative implementation of this | 894 | With a prefix argument ARG, enable Shell Dirtrack mode if ARG is |
| 895 | feature - see the function `dirtrack-mode'." | 895 | positive, and disable it otherwise. If called from Lisp, enable |
| 896 | the mode if ARG is omitted or nil. | ||
| 897 | |||
| 898 | The `dirtrack' package provides an alternative implementation of | ||
| 899 | this feature; see the function `dirtrack-mode'." | ||
| 896 | nil nil nil | 900 | nil nil nil |
| 897 | (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) | 901 | (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) |
| 898 | (if shell-dirtrack-mode | 902 | (if shell-dirtrack-mode |