diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-28 17:46:37 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-10-07 13:56:31 +0000 |
| commit | 7ad0001183688c56bd1edfc8fc08467e380910a4 (patch) | |
| tree | 7df8833fee6f39f5a77dacec68f5824077418886 /Completion/Unix/Command/_cpio | |
| parent | a96e34b459d55240b0f4af37ac73aca916720883 (diff) | |
| download | zsh-7ad0001183688c56bd1edfc8fc08467e380910a4.tar.gz zsh-7ad0001183688c56bd1edfc8fc08467e380910a4.zip | |
39479 + 39481 minus _path_files hunk (see 39489): Completion: audit 'compset -P' calls to use shortest match where applicable, plus random drive-by tweaks.
Found by grepping for patterns that can match needles of various lengths:
:grep 'compset -[PS].*[\#^*()\|<>?~\]' Completion/
Diffstat (limited to 'Completion/Unix/Command/_cpio')
| -rw-r--r-- | Completion/Unix/Command/_cpio | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Completion/Unix/Command/_cpio b/Completion/Unix/Command/_cpio index 6b07a214a..4027cc0ca 100644 --- a/Completion/Unix/Command/_cpio +++ b/Completion/Unix/Command/_cpio @@ -106,10 +106,10 @@ fi _arguments -C -s "$args[@]" && ret=0 if [[ $state = afile ]]; then - if compset -P '*:'; then - # TODO: doesn't need to be rsh. - _wanted files expl 'remote files' \ - compadd $(rsh ${words[CURRENT]%:*} echo ${words[CURRENT]#*:}\*) && ret=0 + if [[ $ig != gnu ]]; then + _files && ret=0 + elif compset -P 1 '*:'; then + _remote_files -- ssh && ret=0 elif compset -P '*@'; then _wanted hosts expl 'remote host name' _hosts && ret=0 else |