diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-19 09:18:25 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-19 09:18:25 +0000 |
| commit | 7cbb6b2ab808cc909a99844b608a101abc067c95 (patch) | |
| tree | 1112fddc70beb9a4d6389771c219ecdab6d8d9c5 /Src/builtin.c | |
| parent | 1ed30d4586030141eb57ff5d2ba285cac45633dc (diff) | |
| download | zsh-7cbb6b2ab808cc909a99844b608a101abc067c95.tar.gz zsh-7cbb6b2ab808cc909a99844b608a101abc067c95.tar.xz zsh-7cbb6b2ab808cc909a99844b608a101abc067c95.zip | |
zsh-workers/8674
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |