mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

25641: add emulation option (NO_)MULTI_FUNC_DEF

Browse source
This commit is contained in:
Peter Stephenson 2008-09-11 12:49:05 +00:00
parent f95570c403
commit 8bb15c1392
5 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-09-11 Peter Stephenson <pws@csr.com>
* 25641: add option (NO_)MULTI_FUNC_DEF to turn off "foo1
foo2...()" function definitions.
2008-09-10 Clint Adams <clint@zsh.org>
* Frank Terbeck: 25640: Completion/Unix/Command/_git: another alias

8
Doc/Zsh/options.yo
View file

@ -1133,6 +1133,14 @@ fn+LPAR()RPAR() { setopt localtraps; trap '' INT; sleep 3; })
will restore normally handling of tt(SIGINT) after the function exits.
)
pindex(MULTI_FUNC_DEF)
item(tt(MULTI_FUNC_DEF) <Z>)(
Allow definitions of multiple functions at once in the form `tt(fn1
fn2)var(...)tt(LPAR()RPAR())'; if the option is not set, this causes
a parse error. Definition of multiple functions with the tt(function)
keyword is always allowed. Multiple function definitions are not often
used and can cause obscure errors.
)
pindex(MULTIOS)
item(tt(MULTIOS) <Z>)(
Perform implicit bf(tee)s or bf(cat)s when multiple

1
Src/options.c
View file

@ -181,6 +181,7 @@ static struct optname optns[] = {
0
#endif
}, MULTIBYTE},
{{NULL, "multifuncdef", OPT_EMULATE|OPT_ZSH}, MULTIFUNCDEF},
{{NULL, "multios", OPT_EMULATE|OPT_ZSH}, MULTIOS},
{{NULL, "nomatch", OPT_EMULATE|OPT_NONBOURNE},NOMATCH},
{{NULL, "notify", OPT_ZSH}, NOTIFY},

3
Src/parse.c
View file

@ -1663,6 +1663,9 @@ par_simple(int *complex, int nr)
zlong oldlineno = lineno;
int onp, so, oecssub = ecssub;
if (!isset(MULTIFUNCDEF) && argc > 1)
YYERROR(oecused);
*complex = c;
lineno = 0;
incmdpos = 1;

1
Src/zsh.h
View file

@ -1882,6 +1882,7 @@ enum {
MENUCOMPLETE,
MONITOR,
MULTIBYTE,
MULTIFUNCDEF,
MULTIOS,
NOMATCH,
NOTIFY,