summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/builtins.yo4
-rw-r--r--Src/builtin.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b6262867..da9547d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-20  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* 34329: Doc/Zsh/builtins.yo, Src/builtin.c: add -S option
+	to which and where.
+
 	* users/19756: Test/A04redirect.ztst: add test for case of
 	closing file descriptor with no error message.
 
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 49c2c11c3..dc3937108 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -2139,11 +2139,11 @@ symlink resolved at each step might be anywhere in the path.
 enditem()
 )
 findex(where)
-item(tt(where) [ tt(-wpms) ] var(name) ...)(
+item(tt(where) [ tt(-wpmsS) ] var(name) ...)(
 Equivalent to tt(whence -ca).
 )
 findex(which)
-item(tt(which) [ tt(-wpams) ] var(name) ...)(
+item(tt(which) [ tt(-wpamsS) ] var(name) ...)(
 Equivalent to tt(whence -c).
 )
 findex(zcompile)
diff --git a/Src/builtin.c b/Src/builtin.c
index 9258ddb6e..1818941b2 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -129,8 +129,8 @@ static struct builtin builtins[] =
     BUILTIN("unsetopt", 0, bin_setopt, 0, -1, BIN_UNSETOPT, NULL, NULL),
     BUILTIN("wait", 0, bin_fg, 0, -1, BIN_WAIT, NULL, NULL),
     BUILTIN("whence", 0, bin_whence, 0, -1, 0, "acmpvfsSw", NULL),
-    BUILTIN("where", 0, bin_whence, 0, -1, 0, "pmsw", "ca"),
-    BUILTIN("which", 0, bin_whence, 0, -1, 0, "ampsw", "c"),
+    BUILTIN("where", 0, bin_whence, 0, -1, 0, "pmsSw", "ca"),
+    BUILTIN("which", 0, bin_whence, 0, -1, 0, "ampsSw", "c"),
     BUILTIN("zmodload", 0, bin_zmodload, 0, -1, 0, "AFRILP:abcfdilmpue", NULL),
     BUILTIN("zcompile", 0, bin_zcompile, 0, -1, 0, "tUMRcmzka", NULL),
 };