From 7ad0001183688c56bd1edfc8fc08467e380910a4 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 28 Sep 2016 17:46:37 +0000
Subject: 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/
---
 Completion/Unix/Command/_cpio | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Completion/Unix/Command/_cpio')

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
-- 
cgit 1.4.1