diff options
| author | Bart Schaefer <schaefer@ipost.com> | 2021-04-13 21:30:06 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@ipost.com> | 2021-04-13 21:30:06 -0700 |
| commit | f85cb4504561df0b486e3e140d4c0434516a0f7f (patch) | |
| tree | 076e1c7ff63c0b59573f5f993e50b63791b7f651 /Src | |
| parent | unposted (cf. 48469): document oddness of ${emptystr[(i)]}. (diff) | |
| parent | 48487 (amended): Failure test for math evaluation oddity (diff) | |
| download | zsh-declarednull.tar zsh-declarednull.tar.gz zsh-declarednull.tar.bz2 zsh-declarednull.tar.lz zsh-declarednull.tar.xz zsh-declarednull.tar.zst zsh-declarednull.zip | |
Merge branch 'typesettounset' into declarednulldeclarednull
Adds 'setopt typeset_to_unset', documentation, failure tests for POSIX incompatibilies, etc.
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/builtin.c | 2 | ||||
| -rw-r--r-- | Src/options.c | 1 | ||||
| -rw-r--r-- | Src/zsh.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index f0c490119..6d119f7a5 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2491,7 +2491,7 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func), return NULL; } } - if (isset(POSIXBUILTINS)) + if (isset(TYPESETTOUNSET)) pm->node.flags |= PM_DEFAULTED; } else { if (idigit(*pname)) diff --git a/Src/options.c b/Src/options.c index 6ea6290e5..783022591 100644 --- a/Src/options.c +++ b/Src/options.c @@ -259,6 +259,7 @@ static struct optname optns[] = { {{NULL, "transientrprompt", 0}, TRANSIENTRPROMPT}, {{NULL, "trapsasync", 0}, TRAPSASYNC}, {{NULL, "typesetsilent", OPT_EMULATE|OPT_BOURNE}, TYPESETSILENT}, +{{NULL, "typesettounset", OPT_EMULATE|OPT_BOURNE}, TYPESETTOUNSET}, {{NULL, "unset", OPT_EMULATE|OPT_BSHELL}, UNSET}, {{NULL, "verbose", 0}, VERBOSE}, {{NULL, "vi", 0}, VIMODE}, @@ -2538,6 +2538,7 @@ enum { TRANSIENTRPROMPT, TRAPSASYNC, TYPESETSILENT, + TYPESETTOUNSET, UNSET, VERBOSE, VIMODE, |