diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-09 10:08:22 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-09 10:08:22 -0800 |
| commit | 121f36e7000283cdf752b83aee6d8fce1f157c1a (patch) | |
| tree | a4a59aaac8b93d380a78b05d76e68a1d476a56f1 | |
| parent | 6783c4538f6aa18d97798e2a0362dfa7487644d3 (diff) | |
| parent | 623d3185814963898655457abcd6577703312a2d (diff) | |
| download | zsh-121f36e7000283cdf752b83aee6d8fce1f157c1a.tar.gz zsh-121f36e7000283cdf752b83aee6d8fce1f157c1a.tar.xz zsh-121f36e7000283cdf752b83aee6d8fce1f157c1a.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 14e6afea4..5b193ab7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * unposted (cf. Jun T.: 37083): Doc/Zsh/mod_private.yo: proofreading diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index 60379cabc..f37753991 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -1568,13 +1568,13 @@ ifnzman(noderef(Arithmetic Evaluation))\ ifzman(the section ARITHMETIC EVALUATION in zmanref(zshmisc)) has an explicit list. ) -pindex(DEBUG_BEFORE_CMD <D>) -pindex(NO_DEBUG_BEFORE_CMD <D>) -pindex(DEBUGBEFORECMD <D>) -pindex(NODEBUGBEFORECMD <D>) +pindex(DEBUG_BEFORE_CMD) +pindex(NO_DEBUG_BEFORE_CMD) +pindex(DEBUGBEFORECMD) +pindex(NODEBUGBEFORECMD) cindex(traps, DEBUG, 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 each command. Setting this option mimics the behaviour of ksh 93; with the option unset the behaviour is that of ksh 88. |