From 8b53e5de541bcdb93502acc31177755082e513b5 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Mon, 13 Mar 2000 10:26:17 +0000
Subject: zsh-workers/10108

---
 Completion/Core/_files         | 2 +-
 Completion/Core/_main_complete | 5 +++--
 Completion/Core/_requested     | 2 +-
 Completion/Core/_wanted        | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'Completion/Core')

diff --git a/Completion/Core/_files b/Completion/Core/_files
index 1e139bc6b..75cabda81 100644
--- a/Completion/Core/_files
+++ b/Completion/Core/_files
@@ -33,7 +33,7 @@ if zstyle -s ":completion:${curcontext}:directories" file-patterns tmp &&
     type="${type}/"
   fi
 else
-  dopts=()
+  dopts=(-/)
 fi
 if zstyle -s ":completion:${curcontext}:globbed-files" file-patterns tmp &&
    [[ -n "$tmp" ]]; then
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index d019351b9..a5af32f0f 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -21,7 +21,7 @@ unsetopt markdirs globsubst shwordsplit nounset ksharrays
 
 local ctxt post ret=1 tmp _compskip format _comp_ignore \
       _completers _completer _completer_num \
-      _matchers _matcher _matcher_num \
+      _matchers _matcher _matcher_num _comp_tags \
       context state line opt_args val_args curcontext="$curcontext" \
       _last_nmatches=-1 _last_menu_style _def_menu_style _menu_style sel \
       _saved_exact="${compstate[exact]}" \
@@ -193,12 +193,13 @@ done
 comppostfuncs=()
 
 _lastcomp=( "${(@kv)compstate}" )
-_lastcomp[completer]="$comp"
+_lastcomp[completer]="$_completer"
 _lastcomp[prefix]="$PREFIX"
 _lastcomp[suffix]="$SUFFIX"
 _lastcomp[iprefix]="$IPREFIX"
 _lastcomp[isuffix]="$ISUFFIX"
 _lastcomp[qiprefix]="$QIPREFIX"
 _lastcomp[qisuffix]="$QISUFFIX"
+_lastcomp[tags]="$_comp_tags"
 
 return ret
diff --git a/Completion/Core/_requested b/Completion/Core/_requested
index a582adfb9..b5efb5a9e 100644
--- a/Completion/Core/_requested
+++ b/Completion/Core/_requested
@@ -8,7 +8,7 @@ else
   tag="$1"
 fi
 
-comptags -R "$tag" &&
+comptags -R "$tag" && _comp_tags="$_comp_tags $tag" &&
     if [[ $# -gt 1 ]]; then
       _description "$@"
       return 0
diff --git a/Completion/Core/_wanted b/Completion/Core/_wanted
index f95d74451..400daa701 100644
--- a/Completion/Core/_wanted
+++ b/Completion/Core/_wanted
@@ -19,7 +19,8 @@ else
 fi
 
 if [[ $# -gt 1 ]]; then
-  _tags "$targs[@]" "$tag" && _description "$@"
+  _tags "$targs[@]" "$tag" && _comp_tags="$_comp_tags $tag" &&
+    _description "$@"
 else
-  _tags "$targs[@]" "$tag"
+  _tags "$targs[@]" "$tag" && _comp_tags="$_comp_tags $tag"
 fi
-- 
cgit 1.4.1