diff options
author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-02 22:25:24 +0000 |
---|---|---|
committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-02 22:25:24 +0000 |
commit | 454bb777cfc9b9c7970ccc1c7574fbf66b83d157 (patch) | |
tree | a82acfdaf1d7f73a7ce44f8a1de641371ebc5e98 | |
parent | 33d1439fdbf56ec100dbddfa9f7472a0da59d183 (diff) | |
download | zsh-454bb777cfc9b9c7970ccc1c7574fbf66b83d157.tar.gz zsh-454bb777cfc9b9c7970ccc1c7574fbf66b83d157.tar.xz zsh-454bb777cfc9b9c7970ccc1c7574fbf66b83d157.zip |
users/19671: remove confusion with whence -a.
If the argument is a full path don't try to search the path for it.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Src/builtin.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ac957d1df..b78c4c3da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-01-02 Peter Stephenson <p.w.stephenson@ntlworld.com> + * 19671: Src/builtin.c: whence -a should still work if there's a + full path already. + * users/19667: Doc/Zsh/builtins.yo, Src/builtin.c, Src/utils.c: whence -S shows intermediate steps in symlink expansion. diff --git a/Src/builtin.c b/Src/builtin.c index 47d1aa06d..ebc06542e 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3315,7 +3315,7 @@ bin_whence(char *nam, char **argv, Options ops, int func) /* Option -a is to search the entire path, * * rather than just looking for one match. */ - if (all) { + if (all && **argv != '/') { char **pp, *buf; pushheap(); |