about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-02-16 16:12:07 +0000
committerPeter Stephenson <pws@zsh.org>2015-02-16 16:12:07 +0000
commit041a85243eb6d32e1cd1dc9f11a510c79e151433 (patch)
treebccca3422314c2ab568b59af022c89b46de9c449
parent8ebe18c081a0bd2f134f5fcbf1650d5d59920c96 (diff)
downloadzsh-041a85243eb6d32e1cd1dc9f11a510c79e151433.tar.gz
zsh-041a85243eb6d32e1cd1dc9f11a510c79e151433.tar.xz
zsh-041a85243eb6d32e1cd1dc9f11a510c79e151433.zip
34558: preexec doc fix.
It was wrongly claming the first parameter was empty if the line was
removed from the history.
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/func.yo8
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