diff options
-rw-r--r-- | Doc/Zsh/options.yo | 4 | ||||
-rw-r--r-- | Src/options.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index fa76b9859..3db844867 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -329,7 +329,7 @@ read and checked for syntax errors, but not executed. ) pindex(EXTENDED_GLOB) cindex(globbing, extended) -item(tt(EXTENDED_GLOB))( +item(tt(EXTENDED_GLOB) <Z>)( Treat the `tt(#)', `tt(~)' and `tt(^)' characters as part of patterns for filename generation, etc. (An initial unquoted `tt(~)' always produces named directory expansion.) @@ -982,7 +982,7 @@ If this option is set the shell tries to interpret single letter options This also affects the value of the tt(-) special parameter. ) pindex(SHORT_LOOPS) -item(tt(SHORT_LOOPS) <D>)( +item(tt(SHORT_LOOPS) <C> <Z>)( Allow the short forms of tt(for), tt(select), tt(if), and tt(function) constructs. ) diff --git a/Src/options.c b/Src/options.c index 5236f61a8..2f1c49fcd 100644 --- a/Src/options.c +++ b/Src/options.c @@ -105,7 +105,7 @@ static struct optname optns[] = { {NULL, "equals", OPT_EMULATE|OPT_ZSH, EQUALS}, {NULL, "errexit", OPT_EMULATE, ERREXIT}, {NULL, "exec", OPT_EMULATE|OPT_ALL, EXECOPT}, -{NULL, "extendedglob", OPT_EMULATE, EXTENDEDGLOB}, +{NULL, "extendedglob", OPT_EMULATE|OPT_ZSH, EXTENDEDGLOB}, {NULL, "extendedhistory", OPT_CSH, EXTENDEDHISTORY}, {NULL, "flowcontrol", OPT_ALL, FLOWCONTROL}, {NULL, "functionargzero", OPT_EMULATE|OPT_NONBOURNE, FUNCTIONARGZERO}, @@ -185,7 +185,7 @@ static struct optname optns[] = { {NULL, "shglob", OPT_EMULATE|OPT_BOURNE, SHGLOB}, {NULL, "shinstdin", OPT_SPECIAL, SHINSTDIN}, {NULL, "shoptionletters", OPT_EMULATE|OPT_BOURNE, SHOPTIONLETTERS}, -{NULL, "shortloops", OPT_EMULATE|OPT_ALL, SHORTLOOPS}, +{NULL, "shortloops", OPT_EMULATE|OPT_NONBOURNE, SHORTLOOPS}, {NULL, "shjobcontrol", OPT_EMULATE|OPT_NONZSH, SHJOBCONTROL}, {NULL, "shwordsplit", OPT_EMULATE|OPT_BOURNE, SHWORDSPLIT}, {NULL, "singlecommand", OPT_SPECIAL, SINGLECOMMAND}, |