about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-11-05 13:01:56 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-11-05 13:01:56 +0000
commit60b410fd7c709f0332355a0b013e92461d3e07ec (patch)
treeabea909b3f4f4d39db3e12a0adbdf0bb0a19b5d7 /Src
parent2a4c8c27c600671a4352e4a8f737ca81465af7af (diff)
downloadzsh-60b410fd7c709f0332355a0b013e92461d3e07ec.tar.gz
zsh-60b410fd7c709f0332355a0b013e92461d3e07ec.tar.xz
zsh-60b410fd7c709f0332355a0b013e92461d3e07ec.zip
"typeset -g <var>" should be silent even without TYPESET_SILENT
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index b6cd9610d..0748eaccc 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1951,7 +1951,8 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func),
 	if (!on && !roff && !value) {
 	    if (OPT_ISSET(ops,'p'))
 		paramtab->printnode(&pm->node, PRINT_TYPESET);
-	    else if (unset(TYPESETSILENT) || OPT_ISSET(ops,'m'))
+	    else if (!OPT_ISSET(ops,'g') &&
+		     (unset(TYPESETSILENT) || OPT_ISSET(ops,'m')))
 		paramtab->printnode(&pm->node, PRINT_INCLUDEVALUE);
 	    return pm;
 	}