From 475aca3cb2d779f7a8c9dfbf05afa7d94250a46c Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Thu, 25 Nov 1999 10:35:15 +0000
Subject: zsh-workers/8777

---
 Completion/Core/_normal    | 4 +++-
 Completion/Core/_sort_tags | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Core/_normal b/Completion/Core/_normal
index f31e7e6fc..f7d797aaa 100644
--- a/Completion/Core/_normal
+++ b/Completion/Core/_normal
@@ -26,14 +26,16 @@ else
   if [[ "$command[1]" == '=' ]]; then
     eval cmd1\=$command
     cmd2="$command[2,-1]"
+    curcontext="${curcontext}::${cmd1}:"
   elif [[ "$command" == */* ]]; then
     cmd1="$command"
     cmd2="${command:t}"
+    curcontext="${curcontext}::${cmd1}:"
   else
     cmd1="$command"
     cmd2="$commands[$command]"
+    curcontext="${curcontext}::${cmd1}:"
   fi
-  curcontext="${curcontext}:${cmd1}"
 fi
 
 # See if there are any matching pattern completions.
diff --git a/Completion/Core/_sort_tags b/Completion/Core/_sort_tags
index f44479d56..6f07eec1c 100644
--- a/Completion/Core/_sort_tags
+++ b/Completion/Core/_sort_tags
@@ -6,17 +6,17 @@ comptry options
 case "$curcontext" in
 # Some silly examples commented out:
 #
-# *p[bgpn]m*)           # change the order for file-completion
+# *::*p[bgpn]m:*)           # change the order for file-completion
 #   comptry globbed-files directories
 #   comptry all-files
 #   ;;
-# *:dvips:-o*)          # automatic context set by _arguments
+# *::dvips::-o*)            # automatic context set by _arguments
 #   comptry all-files
 #   return
 #   ;;
-# *:kill:*)
+# *::kill:*)
 #   comptry processes
-#   return              # this return ensures that we use only processes
+#   return                  # this return ensures that we use only processes
 #   ;;
 *)
   comptry globbed-files
-- 
cgit 1.4.1