From 203169331729cf3df034589f395b01b26667691e Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 13 Aug 1999 13:27:28 +0000
Subject: update.

---
 Completion/Core/_complete | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Core/_complete b/Completion/Core/_complete
index 86ccc8c67..aea05647f 100644
--- a/Completion/Core/_complete
+++ b/Completion/Core/_complete
@@ -16,13 +16,11 @@ if [[ -n "$compcontext" ]]; then
 fi
 
 # An entry for `-first-' is the replacement for `compctl -T'
-# Completion functions may set `_compskip' to any value to make the 
-# main loops stop calling other completion functions.
 
 comp="$_comps[-first-]"
 if [[ ! -z "$comp" ]]; then
   "$comp"
-  if (( $+_compskip )); then
+  if [[ "$_compskip" = all ]]; then
     unset _compskip
     (( compstate[nmatches] ))
     return
@@ -55,8 +53,16 @@ else
 
   # If not, we use default completion, if any.
 
-  [[ -z "$comp" ]] && comp="$_comps[-default-]"
+  if [[ -z "$comp" ]]; then
+    if [[ "$_compskip" = *default* ]]; then
+      unset _compskip
+      return 1
+    fi
+    comp="$_comps[-default-]"
+  fi
   [[ -z "$comp" ]] || "$comp"
 fi
 
+unset _compskip
+
 (( compstate[nmatches] ))
-- 
cgit 1.4.1