From 7cbb6b2ab808cc909a99844b608a101abc067c95 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 19 Nov 1999 09:18:25 +0000
Subject: zsh-workers/8674

---
 Src/builtin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Src/builtin.c')

diff --git a/Src/builtin.c b/Src/builtin.c
index b8e76086a..586396080 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1857,7 +1857,7 @@ bin_typeset(char *name, char **argv, char *ops, int func)
 	return 0;
     }
 
-    if (!ops['g'])
+    if (!ops['g'] && !ops['x'])
 	on |= PM_LOCAL;
 
     if (on & PM_TIED) {
@@ -1895,7 +1895,7 @@ bin_typeset(char *name, char **argv, char *ops, int func)
 	 */
 	if ((pm = (Param) paramtab->getnode(paramtab, asg0.name))
 	    && !(pm->flags & PM_UNSET)
-	    && (locallevel == pm->level || func == BIN_EXPORT)) {
+	    && (locallevel == pm->level || !(on & PM_LOCAL))) {
 	    if (!asg0.value && !(PM_TYPE(pm->flags) & (PM_ARRAY|PM_HASHED)))
 		oldval = ztrdup(getsparam(asg0.name));
 	    on |= (pm->flags & PM_EXPORTED);
-- 
cgit 1.4.1