From 6e99acad52e4c01aff6d105ec067170226ccbc8b Mon Sep 17 00:00:00 2001 From: Sven Wischnowsky Date: Tue, 25 Apr 2000 11:49:10 +0000 Subject: forgotten fix for _arguments using multiple actions (10915) --- ChangeLog | 3 +++ Src/Zle/computil.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c80d834ab..17f2429d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-04-25 Sven Wischnowsky + * 10915: Src/Zle/computil.c: forgotten fix for _arguments using + multiple actions + * 10912: Src/Zle/compresult.c: don't always ignore backslashes in paths when testing file type diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 29a5fcb21..c8e965a8d 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -1399,7 +1399,7 @@ ca_set_data(char *opt, Caarg arg, char **args, int single) for (; arg && (arg->num < 0 || (arg->min <= ca_laststate.nth + addopt && arg->num >= ca_laststate.nth));) { - if ((lopt = arg->type == CAA_OPT) && !opt && oopt > 0) + if (!opt && (lopt = arg->type != CAA_OPT) && oopt > 0) oopt = 0; addlinknode(descr, arg->descr); @@ -1446,7 +1446,7 @@ ca_set_data(char *opt, Caarg arg, char **args, int single) } } } - if (!single && opt && lopt) { + if (!single && opt && !lopt) { opt = NULL; arg = ca_get_arg(ca_laststate.d, ca_laststate.nth); -- cgit 1.4.1