diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/Modules/param_private.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index f3aabff42..3b9baa39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2020-12-02 Bart Schaefer <schaefer@zsh.org> + + * 47704: Src/Modules/param_private.c: fix scope for "private -p" + 2020-12-01 Bart Schaefer <schaefer@zsh.org> * unposted: Etc/BUGS: Add users/26150 (multios + exec) diff --git a/Src/Modules/param_private.c b/Src/Modules/param_private.c index 86416c5c5..24545819d 100644 --- a/Src/Modules/param_private.c +++ b/Src/Modules/param_private.c @@ -171,6 +171,7 @@ bin_private(char *nam, char **args, LinkList assigns, Options ops, int func) { int from_typeset = 1; int ofake = fakelevel; /* paranoia in case of recursive call */ + int hasargs = *args != NULL || (assigns && firstnode(assigns)); makeprivate_error = 0; if (!OPT_ISSET(ops, 'P')) { @@ -190,6 +191,9 @@ bin_private(char *nam, char **args, LinkList assigns, Options ops, int func) } ops->ind['g'] = 2; /* force bin_typeset() to behave as "local" */ + if (OPT_ISSET(ops, 'p') || (!hasargs && OPT_ISSET(ops, '+'))) { + return bin_typeset("private", args, assigns, ops, func); + } queue_signals(); fakelevel = locallevel; |