diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-11 07:57:56 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-11 07:57:56 +0000 |
| commit | fac3086d9782e73dcaf1aa65fd36a0b63a374719 (patch) | |
| tree | 7bab35e2787ca17f02ec932dffae1bfff2ffcfe3 /Functions | |
| parent | 37012f06a7e5e8a64614dbf9032c77cff1bcfcfb (diff) | |
| download | zsh-fac3086d9782e73dcaf1aa65fd36a0b63a374719.tar.gz zsh-fac3086d9782e73dcaf1aa65fd36a0b63a374719.tar.xz zsh-fac3086d9782e73dcaf1aa65fd36a0b63a374719.zip | |
_wanted now tests both tags and labels; change places where _wanted was called without a command; allow multiple patterns per string in file-patterns; update _next_tags to work with labels (10632)
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/Zftp/zfcd_match | 2 | ||||
| -rw-r--r-- | Functions/Zftp/zfget_match | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Functions/Zftp/zfcd_match b/Functions/Zftp/zfcd_match index b5902cdde..8e2b6452a 100644 --- a/Functions/Zftp/zfcd_match +++ b/Functions/Zftp/zfcd_match @@ -30,7 +30,7 @@ if [[ $ZFTP_SYSTEM = UNIX* ]]; then rm -f $tmpf [[ -n $dir && $dir != */ ]] && dir="$dir/" if [[ -n $WIDGET ]]; then - _all_labels directories expl 'remote directory' + _wanted directories expl 'remote directory' compadd -S/ -q -P "$dir" - $reply elif [[ -n $dir ]]; then reply=(${dir}$reply) diff --git a/Functions/Zftp/zfget_match b/Functions/Zftp/zfget_match index 0fe2bc06f..1d90bea60 100644 --- a/Functions/Zftp/zfget_match +++ b/Functions/Zftp/zfget_match @@ -17,7 +17,7 @@ if [[ $ZFTP_SYSTEM == UNIX* && $1 == */* ]]; then local reply reply=(${${${(f)"$(<$tmpf)"}##$dir}%\*}) rm -f $tmpf - _all_labels files expl 'remote file' compadd -P $dir - $reply + _wanted files expl 'remote file' compadd -P $dir - $reply else # On the first argument to ls, we usually get away with a glob. zftp ls "$1*$2" >$tmpf @@ -28,7 +28,7 @@ else local fcache_name zffcache if [[ -n $WIDGET ]]; then - _all_labels files expl 'remote file' compadd -F fignore - ${(P)fcache_name} + _wanted files expl 'remote file' compadd -F fignore - ${(P)fcache_name} else reply=(${(P)fcache_name}); fi |