diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-07-13 11:03:59 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-07-13 11:03:59 +0000 |
| commit | b46926af8d6ccba49018ff0ee6eab186f5e7d5f0 (patch) | |
| tree | a08d188373248fd488cf9f6fb6e92ac5c1ad42a9 /Src/Zle/computil.c | |
| parent | 663ecf8e1237fcc32d2d1951f25e6c3c6ada08b1 (diff) | |
| download | zsh-b46926af8d6ccba49018ff0ee6eab186f5e7d5f0.tar.gz zsh-b46926af8d6ccba49018ff0ee6eab186f5e7d5f0.tar.xz zsh-b46926af8d6ccba49018ff0ee6eab186f5e7d5f0.zip | |
fix for _arguments with single-letter options: recognize option-strings with multiple options; in _main_complete stop trying completers when one called _message, don't display warnings in such cases (12241)
Diffstat (limited to 'Src/Zle/computil.c')
| -rw-r--r-- | Src/Zle/computil.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 9ec338b7b..c26e9abc4 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -1088,7 +1088,7 @@ ca_get_opt(Cadef d, char *line, int full, char **end) static Caopt ca_get_sopt(Cadef d, char *line, char **end, LinkList *lp) { - Caopt p; + Caopt p, pp = NULL; char pre = *line++; LinkList l = NULL; @@ -1112,11 +1112,12 @@ ca_get_sopt(Cadef d, char *line, char **end, LinkList *lp) } } else if (!p || (p && !p->active)) return NULL; + pp = p; p = NULL; } - if (p && end) + if (pp && end) *end = line; - return p; + return pp; } /* Return the n'th argument definition. */ |