From a4ed24438b36698761634591bb2eb397260ca2c3 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Mon, 13 Sep 1999 10:45:28 +0000
Subject: zsh-workers/7798

---
 Completion/Base/_brace_parameter | 42 +++++++++++++++++++++++-----------------
 Completion/Base/_parameter       | 15 +++++++++-----
 2 files changed, 34 insertions(+), 23 deletions(-)

(limited to 'Completion/Base')

diff --git a/Completion/Base/_brace_parameter b/Completion/Base/_brace_parameter
index 4a91dde73..2bf7b6a6d 100644
--- a/Completion/Base/_brace_parameter
+++ b/Completion/Base/_brace_parameter
@@ -1,25 +1,31 @@
 #compdef -brace-parameter-
 
-setopt localoptions extendedglob
+_parameters -e
 
-local lp ls n q
 
-if [[ "$SUFFIX" = *\}* ]]; then
-  ISUFFIX="${SUFFIX#*\}}$ISUFFIX"
-  SUFFIX="${SUFFIX%%\}*}"
-  suf=()
-elif [[ "$LBUFFER" = *\$\{[^}]#\$\{[^}]#$PREFIX ||
-        "$compstate[insert]" = *menu* ]]; then
-  suf=(-b '')
-else
-  suf=(-b ' ')
-fi
+# Without the `-e' option, we would use the following (see the file
+# Core/_parameters for more enlightenment).
 
-lp="$LBUFFER[1,-${#PREFIX}-1]"
-ls="$RBUFFER[${#SUFFIX}+1,-1]"
-n=${(M)#ls##\"#}
-q=${(M)lp%%\"#}
+# setopt localoptions extendedglob
 
-[[ n -gt 0 ]] && suf=''
+# local lp ls n q
 
-_parameters "$suf[@]" -Qs "${q[1,-n-1]}" -r '-:?#%+=[/}'
+# if [[ "$SUFFIX" = *\}* ]]; then
+#   ISUFFIX="${SUFFIX#*\}}$ISUFFIX"
+#   SUFFIX="${SUFFIX%%\}*}"
+#   suf=()
+# elif [[ "$LBUFFER" = *\$\{[^}]#\$\{[^}]#$PREFIX ||
+#         "$compstate[insert]" = *menu* ]]; then
+#   suf=(-b '')
+# else
+#   suf=(-b ' ')
+# fi
+
+# lp="$LBUFFER[1,-${#PREFIX}-1]"
+# ls="$RBUFFER[${#SUFFIX}+1,-1]"
+# n=${(M)#ls##\"#}
+# q=${(M)lp%%\"#}
+
+# [[ n -gt 0 ]] && suf=''
+
+# _parameters "$suf[@]" -Qs "${q[1,-n-1]}" -r '-:?#%+=[/}'
diff --git a/Completion/Base/_parameter b/Completion/Base/_parameter
index aa9e3ce01..1ede49e27 100644
--- a/Completion/Base/_parameter
+++ b/Completion/Base/_parameter
@@ -1,7 +1,12 @@
 #compdef -parameter-
 
-if [[ "$compstate[insert]" = *menu* ]]; then
-  _parameters -s ''
-else
-  _parameters -s ' '
-fi
+_parameters -e
+
+# Without the `-e' option, we would use the following (see the file
+# Core/_parameters for more enlightenment).
+
+# if [[ "$compstate[insert]" = *menu* ]]; then
+#   _parameters -s ''
+# else
+#   _parameters -s ' '
+# fi
-- 
cgit 1.4.1