diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-03-24 00:01:54 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-03-24 00:01:54 +0000 |
| commit | 41fb4173bf31fedebb057b8ae8ba8e6f7149317b (patch) | |
| tree | 405b61f2b0dca30eaca8bf30d145419e54aabbb9 | |
| parent | 993db7cf0267b4d9c7f8faaa40af8948ba26a2e2 (diff) | |
| download | zsh-41fb4173bf31fedebb057b8ae8ba8e6f7149317b.tar.gz zsh-41fb4173bf31fedebb057b8ae8ba8e6f7149317b.tar.xz zsh-41fb4173bf31fedebb057b8ae8ba8e6f7149317b.zip | |
zsh-workers/10214
| -rw-r--r-- | Completion/Builtins/_cd | 4 | ||||
| -rw-r--r-- | Completion/Builtins/_zstyle | 2 | ||||
| -rw-r--r-- | Completion/User/_pbm | 11 | ||||
| -rw-r--r-- | Completion/User/_pspdf | 3 | ||||
| -rw-r--r-- | Completion/User/_tiff | 3 | ||||
| -rw-r--r-- | Completion/User/_zdump | 2 |
6 files changed, 11 insertions, 14 deletions
diff --git a/Completion/Builtins/_cd b/Completion/Builtins/_cd index bea6ffbc6..ed7bda3a3 100644 --- a/Completion/Builtins/_cd +++ b/Completion/Builtins/_cd @@ -34,7 +34,7 @@ elif _popd || [[ $PREFIX != (\~|/|./|../)* && $#cdpath -ne 0 ]]; then if [[ -o cdablevars && -n "$PREFIX" && ! -d ${tdir::=${PREFIX%%/*}} && -d ${~tdir2::="~$tdir"} ]]; then PREFIX="~$PREFIX" - _path_files -/ + _wanted directories expl directory _path_files -/ else local tmpcdpath tmpcdpath=(${${(@)cdpath:#.}:#$PWD}) @@ -43,5 +43,5 @@ elif _popd || [[ $PREFIX != (\~|/|./|../)* && $#cdpath -ne 0 ]]; then "path-directories:directories in cdpath:_path_files -W tmpcdpath -/" fi else - _path_files -/ + _wanted directories expl directory _path_files -/ fi diff --git a/Completion/Builtins/_zstyle b/Completion/Builtins/_zstyle index 6cb369cfd..9f5b0be89 100644 --- a/Completion/Builtins/_zstyle +++ b/Completion/Builtins/_zstyle @@ -47,7 +47,7 @@ styles=( numbers c:bool original c:bool packageset c:packageset - path 'c:_path_files -/' + path 'c:_wanted directories expl directory _path_files -/' ports c:_ports prefer-ignored c:bool prefix-hidden c:bool diff --git a/Completion/User/_pbm b/Completion/User/_pbm index 1f740ad31..0ff62c548 100644 --- a/Completion/User/_pbm +++ b/Completion/User/_pbm @@ -17,11 +17,8 @@ else fi if [[ $# -ne 0 || $+_in_pbm -ne 0 ]]; then - if (( ! $# )); then - _description files expl 'picture file' - set -- "$expl[@]" - fi - _path_files "$@" -g "$pat" || _files "$@" -g '*.(#i)p[bgp]m' + _wanted files expl 'picture file' _path_files "$@" -g "$pat" - || + _files "$@" "$expl[@]" -g '*.(#i)p[bgp]m' return fi @@ -772,6 +769,6 @@ zeisstopnm) ;; *) - _description files expl 'picture file' - _path_files "$expl[@]" -g "$pat" || _files "$expl[@]" -g '*.(#i)p[bgp]m' + _wanted files expl 'picture file' _path_files -g "$pat" || + _files "$expl[@]" -g '*.(#i)p[bgp]m' esac diff --git a/Completion/User/_pspdf b/Completion/User/_pspdf index 7dbccbf48..9d230300e 100644 --- a/Completion/User/_pspdf +++ b/Completion/User/_pspdf @@ -6,7 +6,6 @@ local ret=1 expl # gs gsbj gsdj gsdj500 gslj gslp gsnd ps2ascii _ps && ret=0 -_description files expl 'PDF file' -_path_files "$expl[@]" -g '*.(#i)pdf' +_wanted files expl 'PDF file' _path_files -g '*.(#i)pdf' return ret diff --git a/Completion/User/_tiff b/Completion/User/_tiff index 5f7cc7edb..10c31ca6e 100644 --- a/Completion/User/_tiff +++ b/Completion/User/_tiff @@ -13,7 +13,8 @@ if [[ $# -ne 0 || $+_in_tiff -ne 0 ]]; then _description files expl 'picture file' set -- "$expl[@]" fi - _path_files "$@" -g "$pat" || _files "$@" -g '*.(#i)tiff' + _wanted files expl 'picture file' _path_files "$@" -g "$pat" - || + _files "$@" "$expl[@]" -g '*.(#i)tiff' return fi diff --git a/Completion/User/_zdump b/Completion/User/_zdump index 2f9a010c1..5fdb2b172 100644 --- a/Completion/User/_zdump +++ b/Completion/User/_zdump @@ -6,4 +6,4 @@ fi _arguments '-v[lowest possible]' \ '-c[cutoff]:cutoff year:' \ - '*:timezone:_path_files -W $_zoneinfo_dirs' + '*:timezone:_files -W _zoneinfo_dirs' |