diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/func.yo | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 6fb13715a..f37c218c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Peter Stephenson <p.stephenson@samsung.com> + + * 34558: Doc/Zsh/func.yo: preexec doc erroneously claimed $1 + was empty if line removed from history. + 2015-02-15 Barton E. Schaefer <schaefer@zsh.org> * 34551: Src/builtin.c: Avoid adding an extra "/" to the diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo index 6e9cfeee9..ace0a4051 100644 --- a/Doc/Zsh/func.yo +++ b/Doc/Zsh/func.yo @@ -247,10 +247,10 @@ findex(preexec) vindex(preexec_functions) item(tt(preexec))( Executed just after a command has been read and is about to be -executed. If the history mechanism is active (and the line was not -discarded from the history buffer), the string that the user typed is -passed as the first argument, otherwise it is an empty string. The -actual command that will be executed (including expanded aliases) is +executed. If the history mechanism is active (regardless of whether the +line was discarded from the history buffer), the string that the user +typed is passed as the first argument, otherwise it is an empty string. +The actual command that will be executed (including expanded aliases) is passed in two different forms: the second argument is a single-line, size-limited version of the command (with things like function bodies elided); the third argument contains the full text that is being |