about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-04-06 10:26:57 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2015-04-06 10:26:57 -0700
commitd4f50f2d185247b1e7e0fc7bb92d54df37558d3e (patch)
tree6d2c2b01040aff5fe59544c211f124049d3e22fb /Src
parent1fa68938dcd3cdd5efdac2799eca809259e49736 (diff)
downloadzsh-d4f50f2d185247b1e7e0fc7bb92d54df37558d3e.tar.gz
zsh-d4f50f2d185247b1e7e0fc7bb92d54df37558d3e.tar.xz
zsh-d4f50f2d185247b1e7e0fc7bb92d54df37558d3e.zip
34851: fix thinko from 34093 that short-circuited some "whence -m" searches
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c12
1 files changed, 7 insertions, 5 deletions
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);
 	    }