about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/compsys.yo5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a8c0531a..6523ff8bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-22  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 36578: Doc/Zsh/compsys.yo: option in a mutually exclusive set
+	has key "set-opt" in $opt_args
+
 2015-09-21  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 36580: Src/Zle/compmatch.c: don't copy empty buffer and check
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index d067795dd..d6b180301 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -3982,6 +3982,11 @@ possible completions.  When it contains `tt(-d)' or an argument, the
 option `tt(-c)' will not be considered.  However, after `tt(-a)'
 both sets will still be considered valid.
 
+If an option in a set appears on the command line, it is stored in the
+associative array `tt(opt_args)' with 'var(set)tt(-)var(option)'
+as a key.  In the example above, a key `tt(set1--c)' is used if the option
+`tt(-c)' is on the command line.
+
 If the name given for one of the mutually exclusive sets is of the form
 `tt(LPAR())var(name)tt(RPAR())' then only one value from each set will ever
 be completed; more formally, all specifications are mutually