diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2001-05-15 10:02:34 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2001-05-15 10:02:34 +0000 |
| commit | 231f077a757b799a3e6224fcd89113ff2e67a166 (patch) | |
| tree | d76ce51eb27908e88e95c9ea8e168d6da327c713 | |
| parent | a2a1c2411a4bae2e1428ca2404458c978f8f5920 (diff) | |
| download | zsh-231f077a757b799a3e6224fcd89113ff2e67a166.tar.gz zsh-231f077a757b799a3e6224fcd89113ff2e67a166.tar.xz zsh-231f077a757b799a3e6224fcd89113ff2e67a166.zip | |
14348: fix globalexport with typeset -g
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fc4f17659..0dbee373e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-15 Peter Stephenson <pws@csr.com> + + * 14348: Src/builtin.c: some idiot forgot to make GLOBAL_EXPORT + work with typeset -g. + 2001-05-15 Sven Wischnowsky <wischnow@zsh.org> * 14346: Src/parse.c: calculate the length of the region to map diff --git a/Src/builtin.c b/Src/builtin.c index bc1a35f90..ad340afc8 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1946,7 +1946,7 @@ bin_typeset(char *name, char **argv, char *ops, int func) } if (!(ops['g'] || ops['x'] || ops['m']) || ops['g'] == 2 || *name == 'l' || - !isset(GLOBALEXPORT)) + (!isset(GLOBALEXPORT) && !ops['g'])) on |= PM_LOCAL; if (on & PM_TIED) { |