1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 17:10:59 +01:00

Merge branch 'master' of git://git.code.sf.net/p/zsh/code

Conflicts:
	ChangeLog
This commit is contained in:
Barton E. Schaefer 2015-11-09 10:08:22 -08:00
commit 121f36e700
2 changed files with 10 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2015-11-09 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 37085: Doc/Zsh/options.yo: DEBUG_BEFORE_CMD is set by default.
Also fix entries in the option index.
2015-11-09 Barton E. Schaefer <schaefer@zsh.org> 2015-11-09 Barton E. Schaefer <schaefer@zsh.org>
* unposted (cf. Jun T.: 37083): Doc/Zsh/mod_private.yo: proofreading * unposted (cf. Jun T.: 37083): Doc/Zsh/mod_private.yo: proofreading

View file

@ -1568,13 +1568,13 @@ ifnzman(noderef(Arithmetic Evaluation))\
ifzman(the section ARITHMETIC EVALUATION in zmanref(zshmisc)) ifzman(the section ARITHMETIC EVALUATION in zmanref(zshmisc))
has an explicit list. has an explicit list.
) )
pindex(DEBUG_BEFORE_CMD <D>) pindex(DEBUG_BEFORE_CMD)
pindex(NO_DEBUG_BEFORE_CMD <D>) pindex(NO_DEBUG_BEFORE_CMD)
pindex(DEBUGBEFORECMD <D>) pindex(DEBUGBEFORECMD)
pindex(NODEBUGBEFORECMD <D>) pindex(NODEBUGBEFORECMD)
cindex(traps, DEBUG, before or after command) cindex(traps, DEBUG, before or after command)
cindex(DEBUG trap, before or after command) cindex(DEBUG trap, before or after command)
item(tt(DEBUG_BEFORE_CMD))( item(tt(DEBUG_BEFORE_CMD) <D>)(
Run the tt(DEBUG) trap before each command; otherwise it is run after Run the tt(DEBUG) trap before each command; otherwise it is run after
each command. Setting this option mimics the behaviour of ksh 93; with each command. Setting this option mimics the behaviour of ksh 93; with
the option unset the behaviour is that of ksh 88. the option unset the behaviour is that of ksh 88.