about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2002-07-29 16:02:53 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2002-07-29 16:02:53 +0000
commit39bb8c9e8bf7616d26a1510834caf5849d12a1aa (patch)
tree847eecbbdc1e8a798457d027a5c7b8c9ae9075b7
parente5ccda3b9ce46d2122cb212a79aae0356d89f335 (diff)
downloadzsh-39bb8c9e8bf7616d26a1510834caf5849d12a1aa.tar.gz
zsh-39bb8c9e8bf7616d26a1510834caf5849d12a1aa.tar.xz
zsh-39bb8c9e8bf7616d26a1510834caf5849d12a1aa.zip
17485?: Incorrect test for TYPESET_SILENT
-rw-r--r--ChangeLog5
-rw-r--r--Src/builtin.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 13190b16b..95711e23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-29  Peter Stephenson  <pws@csr.com>
+
+	* 17485?: Src/builtin.c: TYPESET_SILENT part of 17334 used
+	incorrect test.
+
 2002-07-26  Oliver Kiddle  <opk@zsh.org>
 
 	* 17484: Completion/Unix/Command/_netcat,
diff --git a/Src/builtin.c b/Src/builtin.c
index 741ac2305..683cf0506 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1691,7 +1691,7 @@ typeset_single(char *cname, char *pname, Param pm, int func,
 	if (!on && !roff && !value) {
 	    if (ops['p'])
 		paramtab->printnode((HashNode)pm, PRINT_TYPESET);
-	    else if (unset(TYPESETSILENT) && !ops['m'])
+	    else if (unset(TYPESETSILENT) || ops['m'])
 		paramtab->printnode((HashNode)pm, PRINT_INCLUDEVALUE);
 	    return pm;
 	}