From 105009726b3276a16ad39930aba046032597a039 Mon Sep 17 00:00:00 2001
From: Sven Wischnowsky <wischnow@users.sourceforge.net>
Date: Thu, 26 Apr 2001 07:02:47 +0000
Subject: make keep-prefix keep everything up to the first component with a
 parameter expansion, not only if that is at the beginning of the string
 (14092)

---
 Completion/Base/Completer/_expand | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'Completion/Base/Completer')

diff --git a/Completion/Base/Completer/_expand b/Completion/Base/Completer/_expand
index 4835e4efc..8fcedea96 100644
--- a/Completion/Base/Completer/_expand
+++ b/Completion/Base/Completer/_expand
@@ -89,10 +89,16 @@ subd=("$exp[@]")
   [[ "$subd" = "$exp"(|\(N\)) ]] &&  return 1
 
 zstyle -s ":completion:${curcontext}:" keep-prefix tmp || tmp=changed
-if [[ "$word" = [\~\$]*/* && "$tmp" = (yes|true|on|1|changed) ]]; then
-  eval 'epre=( ${(e)~${word%%/*}} )' 2>/dev/null
-  if [[ -n "$epre" && $#epre -eq 1 ]]; then
+
+if [[ "$word" = (\~*/*|*\$*/*) && "$tmp" = (yes|true|on|1|changed) ]]; then
+  if [[ "$word" = *\$* ]]; then
+    opre="${(M)word##*\$[^/]##/}"
+  else
     opre="${word%%/*}"
+  fi
+  eval 'epre=( ${(e)~opre} )' 2> /dev/null
+
+  if [[ -n "$epre" && $#epre -eq 1 ]]; then
     pre="${(q)epre[1]}"
     [[ "$tmp" != changed || $#exp -gt 1 ||
        "${opre}${exp[1]#${pre}}" != "$word" ]] && exp=( ${opre}${^exp#${pre}} )
-- 
cgit 1.4.1