From 1cb11615aa337d98022a48c1c3c8c5c33b0b57c2 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 2 Jul 2003 10:25:05 +0000 Subject: merge changes back from 4.1 --- Completion/Unix/Command/_sccs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Completion/Unix/Command/_sccs') diff --git a/Completion/Unix/Command/_sccs b/Completion/Unix/Command/_sccs index e4af91a97..ff68c0c9a 100644 --- a/Completion/Unix/Command/_sccs +++ b/Completion/Unix/Command/_sccs @@ -8,7 +8,7 @@ _sccs_files() { _files -W $dir -g \*\(:s/s.//\) "$@" } -local curcontext="$curcontext" state line +local curcontext="$curcontext" state line ret=1 typeset -A opt_args local subcmds ropt copt sfiles finalpath @@ -27,12 +27,13 @@ if [[ $service = sccs ]]; then '-r[run with real and not effective user ID]' \ '-d+[specify root prefix]:root prefix:_directories' \ '-p+[specify subdirectory of history file]:path to history file:_directories' \ - '*::command:->subcmd' && return 0 + '*::command:->subcmd' && ret=0 if (( CURRENT == 1 )); then - _wanted commands expl 'sccs command' compadd -a subcmds - return + _wanted commands expl 'sccs command' compadd -a subcmds && ret=0 fi + (( ret )) || return 0 + service="$words[1]" curcontext="${curcontext%:*}-$service:" fi -- cgit 1.4.1