diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f570d44e3..1cb94c46c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-04-06 Barton E. Schaefer <schaefer@zsh.org> + + * 34851: Src/builtin.c: fix thinko from 34093 that short-circuited + some "whence -m" searches + 2015-04-03 Barton E. Schaefer <schaefer@zsh.org> * 34837: Src/glob.c: avoid loss of original file path when applying diff --git a/Src/builtin.c b/Src/builtin.c index 614b17d7e..de0101405 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3236,21 +3236,23 @@ bin_whence(char *nam, char **argv, Options ops, int func) /* -p option is for path search only. * * We're not using it, so search for ... */ - informed = /* logical OR of what follows */ - /* aliases ... */ + informed += scanmatchtable(aliastab, pprog, 1, 0, DISABLED, - aliastab->printnode, printflags) || + aliastab->printnode, printflags); /* and reserved words ... */ + informed += scanmatchtable(reswdtab, pprog, 1, 0, DISABLED, - reswdtab->printnode, printflags) || + reswdtab->printnode, printflags); /* and shell functions... */ + informed += scanmatchtable(shfunctab, pprog, 1, 0, DISABLED, - shfunctab->printnode, printflags) || + shfunctab->printnode, printflags); /* and builtins. */ + informed += scanmatchtable(builtintab, pprog, 1, 0, DISABLED, builtintab->printnode, printflags); } |