diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-01-10 10:31:06 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-01-10 10:32:31 -0800 |
| commit | 3495dc5c275c7e3fe3517cfd20e2dc7f1cfa43db (patch) | |
| tree | cd0f52c49553471f38e6dc64027d75de65ad08a3 | |
| parent | daa788d88b7935ac93a9be54691bdd56e68ae2f3 (diff) | |
| download | zsh-3495dc5c275c7e3fe3517cfd20e2dc7f1cfa43db.tar.gz zsh-3495dc5c275c7e3fe3517cfd20e2dc7f1cfa43db.tar.xz zsh-3495dc5c275c7e3fe3517cfd20e2dc7f1cfa43db.zip | |
34213: in previous patch, do not change usepm if it is already set
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/builtin.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 310f47110..b102fd466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2015-01-10 Barton E. Schaefer <schaefer@zsh.org> - * 34212: Src/builtin.c: do not change unset-ness of special + * 34212, 34313: Src/builtin.c: do not change unset-ness of special parameters when exporting them 2015-01-09 Barton E. Schaefer <schaefer@zsh.org> diff --git a/Src/builtin.c b/Src/builtin.c index 8dee8f910..9258ddb6e 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1934,7 +1934,7 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func), * We need to compare types with an existing pm if special, * even if that's unset */ - if (pm && (pm->node.flags & PM_SPECIAL)) + if (!usepm && pm && (pm->node.flags & PM_SPECIAL)) usepm = 2; /* indicate that we preserve the PM_UNSET flag */ /* |