From 6fd5c631d6293763c3c8be1068387828201095da Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Tue, 24 Aug 1999 09:17:41 +0000
Subject: zsh-workers/7469

---
 Completion/Core/_complete      |  6 +++---
 Completion/Core/_main_complete |  2 --
 Completion/Core/_normal        | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'Completion/Core')

diff --git a/Completion/Core/_complete b/Completion/Core/_complete
index aea05647f..9b6311100 100644
--- a/Completion/Core/_complete
+++ b/Completion/Core/_complete
@@ -21,7 +21,7 @@ comp="$_comps[-first-]"
 if [[ ! -z "$comp" ]]; then
   "$comp"
   if [[ "$_compskip" = all ]]; then
-    unset _compskip
+    _compskip=''
     (( compstate[nmatches] ))
     return
   fi
@@ -55,7 +55,7 @@ else
 
   if [[ -z "$comp" ]]; then
     if [[ "$_compskip" = *default* ]]; then
-      unset _compskip
+      _compskip=''
       return 1
     fi
     comp="$_comps[-default-]"
@@ -63,6 +63,6 @@ else
   [[ -z "$comp" ]] || "$comp"
 fi
 
-unset _compskip
+_compskip=''
 
 (( compstate[nmatches] ))
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index 6e84818ee..c30315395 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -98,6 +98,4 @@ _lastcomp[isuffix]="$ISUFFIX"
 _lastcomp[qiprefix]="$QIPREFIX"
 _lastcomp[qisuffix]="$QISUFFIX"
 
-unset _compskip
-
 return ret
diff --git a/Completion/Core/_normal b/Completion/Core/_normal
index ffacc8f04..2b53e0b02 100644
--- a/Completion/Core/_normal
+++ b/Completion/Core/_normal
@@ -1,6 +1,6 @@
 #autoload
 
-local comp command cmd1 cmd2 pat val name i ret=1
+local comp command cmd1 cmd2 pat val name i ret=1 _compskip="$_compskip"
 
 # Completing in command position? If not we set up `cmd1' and `cmd2' as
 # two strings we have to search in the completion definition arrays (e.g.
@@ -38,7 +38,7 @@ if [[ "$_compskip" != (all|*patterns*) ]]; then
       if [[ "$_compskip" = *patterns* ]]; then
         break
       elif [[ "$_compskip" = all ]]; then
-        unset _compskip
+        _compskip=''
         return ret
       fi
     fi
@@ -67,7 +67,7 @@ else
     comp="$_comps[-default-]"
   fi
 fi
-  
+
 if [[ "$_compskip" != (all|*patterns*) ]]; then
   for i in "$_postpatcomps[@]"; do
     pat="${i% *}"
@@ -78,7 +78,7 @@ if [[ "$_compskip" != (all|*patterns*) ]]; then
       if [[ "$_compskip" = *patterns* ]]; then
 	break
       elif [[ "$_compskip" = all ]]; then
-        unset _compskip
+        _compskip=''
         return ret
       fi
     fi
@@ -88,6 +88,6 @@ fi
 [[ "$name" = -default- && -n "$comp" && "$_compskip" != (all|*default*) ]] &&
   "$comp" && ret=0
 
-unset _compskip
+_compskip=''
 
 return ret
-- 
cgit 1.4.1