diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-05-02 08:23:31 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-05-02 08:23:31 +0000 |
commit | 753cc6b22adb659e9c6bdcf854d99bfe4b731d26 (patch) | |
tree | 9e3e7f2f5bb5bd6756860ee5d735b8392c01b3ed /Completion/User | |
parent | 3d088f16aab58abcedcad8720ffbbfadee38bdc3 (diff) | |
download | zsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.tar.gz zsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.tar.xz zsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.zip |
completion cleanup, mostly _wanted and $expl (11049)
Diffstat (limited to 'Completion/User')
-rw-r--r-- | Completion/User/_gprof | 2 | ||||
-rw-r--r-- | Completion/User/_mount | 2 | ||||
-rw-r--r-- | Completion/User/_socket | 3 | ||||
-rw-r--r-- | Completion/User/_urls | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Completion/User/_gprof b/Completion/User/_gprof index 659e921e8..f261ff700 100644 --- a/Completion/User/_gprof +++ b/Completion/User/_gprof @@ -49,7 +49,7 @@ if [[ -n "$state" ]]; then expl=function fi _wanted functions expl "$expl" \ - compadd "$expl[@]" -M 'r:|_=* r:|=*' - "$_gprof_funcs[@]" && ret=0 + compadd -M 'r:|_=* r:|=*' - "$_gprof_funcs[@]" && ret=0 else return 1 fi diff --git a/Completion/User/_mount b/Completion/User/_mount index 418b7974f..0d8d0996f 100644 --- a/Completion/User/_mount +++ b/Completion/User/_mount @@ -540,7 +540,7 @@ fstype) compset -P '*,' _wanted types expl 'file system type' \ - compadd "$expl[@]" -qS, -M 'L:|no=' - "$fss[@]" && ret=0 + compadd -qS, -M 'L:|no=' - "$fss[@]" && ret=0 ;; fsopt) _tags options || return 1 diff --git a/Completion/User/_socket b/Completion/User/_socket index af9c8ab0a..788113c28 100644 --- a/Completion/User/_socket +++ b/Completion/User/_socket @@ -11,8 +11,7 @@ typeset -A opt_args [[ $CURRENT -eq 2 ]] && { ! zstyle -T ":completion:${curcontext}:options" prefix-needed || [[ "$PREFIX" = -* ]] } && - _wanted options expl option \ - compadd -M 'r:|[_-]=* r:|=*' "$expl[@]" - -version + _wanted options expl option compadd - -version _arguments -C -s \ '-b[background]' \ diff --git a/Completion/User/_urls b/Completion/User/_urls index f9c3284f7..f335b16aa 100644 --- a/Completion/User/_urls +++ b/Completion/User/_urls @@ -104,7 +104,7 @@ case "$scheme" in while _next_label files expl 'bookmark'; do _path_files -W "$urls_path/$scheme" "$expl[@]" -S '' -g '*(^/)' && ret=0 - _path_files -W "$urls_path/$scheme" -S/ -r '/' -/ && ret=0 + _path_files -W "$urls_path/$scheme" "$expl[@]" -S/ -r '/' -/ && ret=0 done (( ret )) || return 0 done |