summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2014-11-11 19:51:05 +0000
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2014-11-11 19:51:05 +0000
commite33411990e1353e5d39379adb56e325ab92ce28c (patch)
tree83f2c8d0b16b08e17c6b5f9e54850d6483e0a7ac
parentc9804bebd897fe822053f8631aed1de970120f9d (diff)
downloadzsh-e33411990e1353e5d39379adb56e325ab92ce28c.tar.gz
zsh-e33411990e1353e5d39379adb56e325ab92ce28c.tar.xz
zsh-e33411990e1353e5d39379adb56e325ab92ce28c.zip
AUTO_CD behaviour depends on SHIN_STDIN, document
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/options.yo4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 495a6f9c5..64d0820be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-11  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 33658: Doc/Zsh/options.yo: AUTO_CD depends on SHIN_STDIN.
+
 2014-11-09  Oliver Kiddle  <opk@zsh.org>
 
 	* 33599: Jun T.: Test/comptest: workaround zpty issue that
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index b9f78bfa3..076aaf44f 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -63,6 +63,10 @@ item(tt(AUTO_CD) (tt(-J)))(
 If a command is issued that can't be executed as a normal command,
 and the command is the name of a directory, perform the tt(cd)
 command to that directory.
+This option is only applicable if the option tt(SHIN_STDIN) is set,
+i.e. if commands are being read from standard input.  The option
+is designed for interactive use; it is recommended that tt(cd)
+be used explicitly in scripts to avoid ambiguity.
 )
 pindex(AUTO_PUSHD)
 pindex(NO_AUTO_PUSHD)