From 7ad0001183688c56bd1edfc8fc08467e380910a4 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf 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 v1.2.3 From bb28726fa5e29b7a5640cdab13e9d7a7e838f6a6 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 5 Nov 2016 20:39:46 +0000 Subject: 39840: _cpio: Declare variable's type correctly. --- ChangeLog | 5 +++++ Completion/Unix/Command/_cpio | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_cpio') diff --git a/ChangeLog b/ChangeLog index bf41244ce..a3a8c00fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-07 Daniel Shahaf + + * 39840: Completion/Unix/Command/_cpio: Declare variable's + type correctly. + 2016-11-07 Jun-ichi Takimoto * 39728: Src/zsh_system.h, Src/Modules/datetime.c: define diff --git a/Completion/Unix/Command/_cpio b/Completion/Unix/Command/_cpio index 4027cc0ca..699b1d8f2 100644 --- a/Completion/Unix/Command/_cpio +++ b/Completion/Unix/Command/_cpio @@ -1,6 +1,7 @@ #compdef cpio -local args ig curcontext="$curcontext" state line +local -a args +local ig curcontext="$curcontext" state line local expl ret=1 local fmts='(bar bin odc newc crc tar ustar hpbin hpodc)' -- cgit v1.2.3