PATCH: _arguments sets and a match spec

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

A match spec passed to _arguments wouldn't work in combination with
sets.

Oliver

diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 192ddeab9..d2f0c999b 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -1288,7 +1288,7 @@ parse_cadef(char *nam, char **args)
 		ret->ndopts = ndopts;
 		ret->nodopts = nodopts;
 		set_cadef_opts(ret);
-		ret = ret->snext = alloc_cadef(NULL, single, NULL, nonarg, flags);
+		ret = ret->snext = alloc_cadef(NULL, single, match, nonarg, flags);
 		optp = &(ret->opts);
 		nopts = ndopts = nodopts = 0;
 		anum = 1;
diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst
index 6f0cac034..d09b118a2 100644
--- a/Test/Y03arguments.ztst
+++ b/Test/Y03arguments.ztst
@@ -277,6 +277,11 @@
 >line: {tst j}{}
 >line: {tst -y }{}
 
+ tst_arguments -M 'm:{j}={y}' -y -n - set1 -i - set2 -k
+ comptest $'tst -k -j\t'
+0:matcher in combination with sets (implies separate cadef structure)
+>line: {tst -k -y }{}
+
  tst_arguments -x :word
  comptest $'tst -- -\t'
 0:option after --