From 990f7b91df5152bb7b873b7b998615744cd5d8e4 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 11 Nov 2003 10:35:55 +0000 Subject: _perforce completion bug fixes --- Completion/Unix/Command/_perforce | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'Completion') diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce index 7d9aa48eb..e77267b45 100644 --- a/Completion/Unix/Command/_perforce +++ b/Completion/Unix/Command/_perforce @@ -987,9 +987,12 @@ _perforce_files() { altfiles+=("$type-files:$type file:_perforce_${type}_files") done - altfiles+=("depot-dirs:directory in depot:_perforce_depot_dirs" - "subdirs:subdirectory search:_perforce_subdirs" - "directories:directory:_path_files -/") + altfiles+=("subdirs:subdirectory search:_perforce_subdirs") + if zstyle -t ":completion:${curcontext}:" depot-files; then + altfiles+=("depot-dirs:directory in depot:_perforce_depot_dirs") + else + altfiles+=("directories:directory:_path_files -/") + fi _alternative $altfiles elif zstyle -t ":completion:${curcontext}:" depot-files; then local -a altfiles @@ -1044,7 +1047,9 @@ _perforce_filetypes() { (( $+functions[_perforce_groups] )) || _perforce_groups() { - _describe -t groups 'Perforce group' $(_perforce_call_p4 groups groups) + local -a values + values=($(_perforce_call_p4 groups groups)) + _describe -t groups 'Perforce group' values } @@ -1275,7 +1280,7 @@ _perforce_users() { ul=(${${(f)"$(_perforce_call_p4 users users)"}/\ /:}) [[ $#ul -eq 1 && $ul[1] = '' ]] && ul=() - _describe -t clients 'Perforce client' ul + _describe -t users 'Perforce user' ul } -- cgit 1.4.1