aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-04-01 21:15:44 +0000
committerEli Zaretskii2006-04-01 21:15:44 +0000
commit5113b2942fcf311fefa2c5415934a3f453b8fb33 (patch)
tree0fc6431dc68e892a845882fde56670f3c0d31bb3
parent61be4a8a1ff75fd80df7d1e68e0b34b1652a8d7a (diff)
downloademacs-5113b2942fcf311fefa2c5415934a3f453b8fb33.tar.gz
emacs-5113b2942fcf311fefa2c5415934a3f453b8fb33.zip
(shell-directory-tracker, shell-dynamic-complete-command): Doc fixes.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/shell.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aad3ec0b64..743922f0ef5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-04-02 Michael Ernst <mernst@alum.mit.edu>
2
3 * shell.el (shell-directory-tracker)
4 (shell-dynamic-complete-command): Doc fixes.
5
12006-04-01 Matt Hodges <MPHodges@member.fsf.org> 62006-04-01 Matt Hodges <MPHodges@member.fsf.org>
2 7
3 * pcomplete.el (pcomplete-show-completions): Recognize TAB on text 8 * pcomplete.el (pcomplete-show-completions): Recognize TAB on text
diff --git a/lisp/shell.el b/lisp/shell.el
index f7eaeb84341..71b5862feb6 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -574,7 +574,7 @@ Otherwise, one argument `-i' is passed to the shell.
574;;; 2. It cannot infallibly deal with command sequences, though it does well 574;;; 2. It cannot infallibly deal with command sequences, though it does well
575;;; with these and with ignoring commands forked in another shell with ()s. 575;;; with these and with ignoring commands forked in another shell with ()s.
576;;; 3. More generally, any complex command is going to throw it. Otherwise, 576;;; 3. More generally, any complex command is going to throw it. Otherwise,
577;;; you'd have to build an entire shell interpreter in emacs lisp. Failing 577;;; you'd have to build an entire shell interpreter in Emacs Lisp. Failing
578;;; that, there's no way to catch shell commands where cd's are buried 578;;; that, there's no way to catch shell commands where cd's are buried
579;;; inside conditional expressions, aliases, and so forth. 579;;; inside conditional expressions, aliases, and so forth.
580;;; 580;;;
@@ -608,7 +608,7 @@ It watches for cd, pushd and popd commands and sets the buffer's
608default directory to track these commands. 608default directory to track these commands.
609 609
610You may toggle this tracking on and off with M-x dirtrack-mode. 610You may toggle this tracking on and off with M-x dirtrack-mode.
611If emacs gets confused, you can resync with the shell with M-x dirs. 611If Emacs gets confused, you can resync with the shell with M-x dirs.
612 612
613See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', 613See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp',
614and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', 614and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract',
@@ -929,7 +929,7 @@ See `shell-command-regexp'."
929(defun shell-dynamic-complete-command () 929(defun shell-dynamic-complete-command ()
930 "Dynamically complete the command at point. 930 "Dynamically complete the command at point.
931This function is similar to `comint-dynamic-complete-filename', except that it 931This function is similar to `comint-dynamic-complete-filename', except that it
932searches `exec-path' (minus the trailing emacs library path) for completion 932searches `exec-path' (minus the trailing Emacs library path) for completion
933candidates. Note that this may not be the same as the shell's idea of the 933candidates. Note that this may not be the same as the shell's idea of the
934path. 934path.
935 935