summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Doc/Zsh/compsys.yo6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ded88181d..031a6c851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-14  Mikael Magnusson <mikachu@gmail.com>
+
+	* 29271: Doc/Zsh/compwid.yo: document _alternative -O name.
+
 2011-05-14  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 29282: Src/mem.c: hide prototypes for ZSH_HEAP_DEBUG with
@@ -14708,5 +14712,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5303 $
+* $Revision: 1.5304 $
 *****************************************************
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 0fdd6d017..35b200bd2 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -3419,7 +3419,7 @@ tt(compadd) with additional options which will take precedence over
 those generated by tt(_all_labels).
 )
 findex(_alternative)
-item(tt(_alternative) [ tt(-C) var(name) ] var(spec) ...)(
+item(tt(_alternative) [ tt(-O) var(name) ] [ tt(-C) var(name) ] var(spec) ...)(
 This function is useful in simple cases where multiple tags are available.
 Essentially it implements a loop like the one described for the tt(_tags)
 function below.
@@ -3446,6 +3446,10 @@ the actions, which will loop over all sets of tags.  Special handling is
 only required if there is an additional valid tag, for example inside a
 function called from tt(_alternative).
 
+The option `tt(-O) var(name)' is used in the same way as by the
+tt(_arguments) function.  In other words, the elements of the var(name)
+array will be passed to tt(compadd) when executing an action.
+
 Like tt(_tags) this function supports the tt(-C) option to give a
 different name for the argument context field.
 )