diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-08-08 12:11:42 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-08-08 12:11:42 +0000 |
| commit | 3bca186819e7e1e0fc6321592ccc62d75e0525be (patch) | |
| tree | ed20d5f24243443b31311aa4307995f0ce5359e8 | |
| parent | 5c90cf1a51b176badb0095a089df132fc5f62746 (diff) | |
| download | zsh-3bca186819e7e1e0fc6321592ccc62d75e0525be.tar.gz zsh-3bca186819e7e1e0fc6321592ccc62d75e0525be.tar.xz zsh-3bca186819e7e1e0fc6321592ccc62d75e0525be.zip | |
handle the right option in strings with multiple single-letter options (and correctly handle its argument) (12567)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Linux/_rpm | 2 | ||||
| -rw-r--r-- | Src/Zle/computil.c | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 902dcf003..c205c1cc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-08-08 Sven Wischnowsky <wischnow@zsh.org> + * 12567: Completion/Linux/_rpm, Src/Zle/computil.c: handle the + right option in strings with multiple single-letter options (and + correctly handle its argument) + * 12565: Completion/Core/_expand, Completion/Core/_path_files, Doc/Zsh/mod_computil.yo, Src/Zle/computil.c: more fixes for completion of special characters (quoting) diff --git a/Completion/Linux/_rpm b/Completion/Linux/_rpm index 11bb370b8..34bf30e73 100644 --- a/Completion/Linux/_rpm +++ b/Completion/Linux/_rpm @@ -59,7 +59,7 @@ _rpm () { ) packageopts=( '-a[query all packages]' - '-p+[query uninstalled package file]:*:RPM package file:->package_file' + '-p[query uninstalled package file]:*:RPM package file:->package_file' '-f[specify file to query owner of]:file:_files' '--triggeredby:RPM package:->package' '--whatprovides:RPM capability:->capability' diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 863f15fa1..fcc79b2c4 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -1108,6 +1108,7 @@ ca_get_sopt(Cadef d, char *line, char **end, LinkList *lp) line++; *end = line; } + pp = p; break; } } else if (!p || (p && !p->active)) @@ -1429,7 +1430,9 @@ ca_parse_line(Cadef d, int multi, int first) if (!state.oargs[state.curopt->num]) state.oargs[state.curopt->num] = znewlinklist(); - ddef = state.def = state.curopt->args; + state.def = state.curopt->args; + ddef = (state.curopt->type == CAO_NEXT && cur == compcurrent ? + NULL : state.def); dopt = state.curopt; doff = pe - line; state.optbeg = state.argbeg = state.inopt = cur; |