mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-03 22:32:12 +02:00
zsh-workers/8674
This commit is contained in:
parent
1ed30d4586
commit
7cbb6b2ab8
1 changed files with 2 additions and 2 deletions
|
@ -1857,7 +1857,7 @@ bin_typeset(char *name, char **argv, char *ops, int func)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ops['g'])
|
if (!ops['g'] && !ops['x'])
|
||||||
on |= PM_LOCAL;
|
on |= PM_LOCAL;
|
||||||
|
|
||||||
if (on & PM_TIED) {
|
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))
|
if ((pm = (Param) paramtab->getnode(paramtab, asg0.name))
|
||||||
&& !(pm->flags & PM_UNSET)
|
&& !(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)))
|
if (!asg0.value && !(PM_TYPE(pm->flags) & (PM_ARRAY|PM_HASHED)))
|
||||||
oldval = ztrdup(getsparam(asg0.name));
|
oldval = ztrdup(getsparam(asg0.name));
|
||||||
on |= (pm->flags & PM_EXPORTED);
|
on |= (pm->flags & PM_EXPORTED);
|
||||||
|
|
Loading…
Reference in a new issue