diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-01-24 17:19:53 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-01-24 17:19:53 +0100 |
| commit | 86ca06fb4b5a835caac37700952207db4c5073cd (patch) | |
| tree | c2686e6d126d59052310c6bb7cd8df6d76fa0fca /Src/options.c | |
| parent | 370659ae9ae918a07a7950bbc2827b2593126f7d (diff) | |
| parent | d18ce35d060163ea0d531170b65e1c38311af166 (diff) | |
| download | zsh-86ca06fb4b5a835caac37700952207db4c5073cd.tar.gz zsh-86ca06fb4b5a835caac37700952207db4c5073cd.zip | |
Merge branch 'upstream' at 5.2-dev-1 into debian
Diffstat (limited to 'Src/options.c')
| -rw-r--r-- | Src/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Src/options.c b/Src/options.c index 2678626c7..17c46c311 100644 --- a/Src/options.c +++ b/Src/options.c @@ -256,7 +256,7 @@ static struct optname optns[] = { {{NULL, "unset", OPT_EMULATE|OPT_BSHELL}, UNSET}, {{NULL, "verbose", 0}, VERBOSE}, {{NULL, "vi", 0}, VIMODE}, -{{NULL, "warncreateglobal", 0}, WARNCREATEGLOBAL}, +{{NULL, "warncreateglobal", OPT_EMULATE}, WARNCREATEGLOBAL}, {{NULL, "xtrace", 0}, XTRACE}, {{NULL, "zle", OPT_SPECIAL}, USEZLE}, {{NULL, "braceexpand", OPT_ALIAS}, /* ksh/bash */ -IGNOREBRACES}, |