mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

35008: clarify description of 'exec' and 'return'

Browse source
This commit is contained in:
Jun-ichi Takimoto 2015-05-01 22:09:49 +09:00
parent 0e797d79ce
commit 938751d263
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-05-01 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 35008: Doc/Zsh/builtins.yo: clarify description of 'exec' and
'return'
2015-05-01 Peter Stephenson <p.stephenson@samsung.com> 2015-05-01 Peter Stephenson <p.stephenson@samsung.com>
* 35007: Doc/Zsh/zle.yo: note about scope of ZLE parameters. * 35007: Doc/Zsh/zle.yo: note about scope of ZLE parameters.

18
Doc/Zsh/builtins.yo
View file

@ -198,7 +198,7 @@ cindex(exiting loops)
cindex(loops, exiting) cindex(loops, exiting)
item(tt(break) [ var(n) ])( item(tt(break) [ var(n) ])(
Exit from an enclosing tt(for), tt(while), Exit from an enclosing tt(for), tt(while),
tt(until), tt(select) or tt(repeat) loop. If var(n) tt(until), tt(select) or tt(repeat) loop. If an arithmetic expression var(n)
is specified, then break var(n) levels instead of just one. is specified, then break var(n) levels instead of just one.
) )
findex(builtin) findex(builtin)
@ -291,7 +291,7 @@ cindex(continuing loops)
item(tt(continue) [ var(n) ])( item(tt(continue) [ var(n) ])(
Resume the next iteration of the enclosing Resume the next iteration of the enclosing
tt(for), tt(while), tt(until), tt(select) or tt(for), tt(while), tt(until), tt(select) or
tt(repeat) loop. If var(n) is specified, break out of tt(repeat) loop. If an arithmetic expression var(n) is specified, break out of
var(n)-1 loops and resume at the var(n)th enclosing loop. var(n)-1 loops and resume at the var(n)th enclosing loop.
) )
alias(declare)(typeset) alias(declare)(typeset)
@ -615,16 +615,21 @@ the same as if the commands had been executed directly by the shell;
if there are no var(args) or they contain no commands (i.e. are if there are no var(args) or they contain no commands (i.e. are
an empty string or whitespace) the return status is zero. an empty string or whitespace) the return status is zero.
) )
item(tt(exec) [ tt(-cl) ] [ tt(-a) var(argv0) ] var(simple command))( item(tt(exec) [ tt(-cl) ] [ tt(-a) var(argv0) ] [ var(command) [ var(arg) ... ]])(
Replace the current shell with an external command rather than forking. Replace the current shell with an external var(command) rather than forking.
With tt(-c) clear the environment; with tt(-l) prepend tt(-) to the With tt(-c) clear the environment; with tt(-l) prepend tt(-) to the
tt(argv[0]) string of the command executed (to simulate a login shell); tt(argv[0]) string of the command executed (to simulate a login shell);
with tt(-a) var(argv0) set the tt(argv[0]) string of the command with tt(-a) var(argv0) set the tt(argv[0]) string of the command
executed. See noderef(Precommand Modifiers). executed. See noderef(Precommand Modifiers).
cindex(redirection, current shell's I/O)
If var(command) is omitted but any redirections are specified,
then the redirections will take effect in the current shell.
) )
findex(exit) findex(exit)
item(tt(exit) [ var(n) ])( item(tt(exit) [ var(n) ])(
Exit the shell with the exit status specified by var(n); if none Exit the shell with the exit status specified by an arithmetic
expression var(n); if none
is specified, use the exit status from the last command executed. is specified, use the exit status from the last command executed.
pindex(IGNORE_EOF, use of) pindex(IGNORE_EOF, use of)
An EOF condition will also cause the shell to exit, unless An EOF condition will also cause the shell to exit, unless
@ -1409,7 +1414,8 @@ findex(return)
cindex(functions, returning from) cindex(functions, returning from)
item(tt(return) [ var(n) ])( item(tt(return) [ var(n) ])(
Causes a shell function or `tt(.)' script to return to Causes a shell function or `tt(.)' script to return to
the invoking script with the return status specified by var(n). If var(n) the invoking script with the return status specified by
an arithmetic expression var(n). If var(n)
is omitted, the return status is that of the last command is omitted, the return status is that of the last command
executed. executed.