diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/User/_hosts | 2 | ||||
| -rw-r--r-- | Completion/User/_zip | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 12199da58..1799992c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-03-12 Oliver Kiddle <opk@zsh.org> + + * unposted: Completion/User/_zip, Completion/User/_hosts: handle + filenames containing spaces in zip archives and don't complete lftp + from _hosts + 2001-03-12 Chmouel Boudjnah <chmouel@mandrakesoft.com> * 13601: Completion/User/_lftp: Add completion for lftp diff --git a/Completion/User/_hosts b/Completion/User/_hosts index f41097f96..fc2970cb9 100644 --- a/Completion/User/_hosts +++ b/Completion/User/_hosts @@ -1,4 +1,4 @@ -#compdef ftp ping rwho rup xping traceroute host lftp +#compdef ftp ping rwho rup xping traceroute host local expl hosts diff --git a/Completion/User/_zip b/Completion/User/_zip index d6bb2d835..b01b756af 100644 --- a/Completion/User/_zip +++ b/Completion/User/_zip @@ -99,9 +99,10 @@ esac case $state in suffixes) compset -P '*:' - compset -S ':*' || suf=":" + compset -S ':*' || suf=":." suffixes=( *.*(N:e) ) - _wanted suffixes expl suffixes compadd -S "$suf" -r " " .$^suffixes && return 0 + _wanted suffixes expl suffixes \ + compadd -S "$suf" -r ": \t" .$^suffixes && return 0 ;; files) if [[ $service = zip ]] && (( ! ${+opt_args[-d]} )); then @@ -113,9 +114,10 @@ case $state in [[ -z $zipfile[1] ]] && return 1 if [[ $zipfile[1] != $_zip_cache_list ]]; then _zip_cache_name="$zipfile[1]" - _zip_cache_list=( $(zipinfo -1 $_zip_cache_name) ) + _zip_cache_list=( ${(f)"$(zipinfo -1 $_zip_cache_name)"} ) fi - _wanted files expl 'file from archive' _multi_parts / _zip_cache_list + _wanted files expl 'file from archive' \ + _multi_parts / _zip_cache_list && return 0 fi ;; esac |