From 65345f9e5036da80e2acd2941a9703526c9d44ad Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 26 Nov 1999 08:56:49 +0000
Subject: zsh-workers/8787

---
 Completion/Core/_approximate   | 2 +-
 Completion/Core/_correct       | 4 +++-
 Completion/Core/_expand        | 4 +++-
 Completion/Core/_main_complete | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Completion/Core/_approximate b/Completion/Core/_approximate
index 0c0c8566f..9c2e35306 100644
--- a/Completion/Core/_approximate
+++ b/Completion/Core/_approximate
@@ -17,7 +17,7 @@ local curcontext="${curcontext}" oldcontext
 
 [[ "${#:-$PREFIX$SUFFIX}" -le 1 ]] && return 1
 
-[[ "$curcontext" != *:correct ]] && curcontext="${curcontext}:approximate"
+[[ "$curcontext" != *:correct* ]] && curcontext="${curcontext}:approximate"
 
 oldcontext="$curcontext"
 
diff --git a/Completion/Core/_correct b/Completion/Core/_correct
index c958bdb83..35114ed22 100644
--- a/Completion/Core/_correct
+++ b/Completion/Core/_correct
@@ -8,7 +8,9 @@
 # Supported configuration keys are the same as for `_approximate', only
 # starting with `correct'.
 
-local ret=1 opm="$compstate[pattern_match]" curcontext="${curcontext}:correct"
+local ret=1 opm="$compstate[pattern_match]" curcontext="${curcontext}"
+
+[[ "$curcontext" != :correct* ]] && curcontext="${curcontext}:correct"
 
 compstate[pattern_match]='-'
 
diff --git a/Completion/Core/_expand b/Completion/Core/_expand
index 68c09ddbb..e611dc3e2 100644
--- a/Completion/Core/_expand
+++ b/Completion/Core/_expand
@@ -8,7 +8,9 @@
 # word from the line.
 
 local exp word="$PREFIX$SUFFIX" group=-V expl expl2 disp orig menu prompt
-local curcontext="${curcontext}:expand" expr descr
+local curcontext="${curcontext}" expr descr
+
+[[ "$curcontext" != :correct* ]] && curcontext="${curcontext}:correct"
 
 # First, see if we should insert all *completions*.
 
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index 51f72d504..c23ce41cd 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -18,7 +18,7 @@
 
 
 local comp post ret=1 _compskip _prio_num=1 _cur_context format
-local context state line opt_args val_args curcontext
+local context state line opt_args val_args curcontext="$curcontext"
 typeset -U _offered_tags _tried_tags _failed_tags _used_tags _unused_tags
 
 _offered_tags=()
-- 
cgit 1.4.1