From aadd07e05f18a41e44129cbbb1b37796a54a685f Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Fri, 13 Jun 2008 14:27:37 +0000
Subject: zcalc completion idiosyncracies with :!

---
 Completion/Zsh/Context/_zcalc_line | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Zsh/Context/_zcalc_line b/Completion/Zsh/Context/_zcalc_line
index 6ce3d82bf..76e5b4b25 100644
--- a/Completion/Zsh/Context/_zcalc_line
+++ b/Completion/Zsh/Context/_zcalc_line
@@ -22,7 +22,7 @@ _zcalc_line_escapes() {
 _zcalc_line() {
   local expl
 
-  if [[ CURRENT -eq 1 && $words[1] != ":!"* ]]; then
+  if [[ CURRENT -eq 1 && $words[1] != ":"(\\|)"!"* ]]; then
     local -a alts
     if [[ $words[1] = (|:*) ]]; then
       alts=("command-escapes:command escape:_zcalc_line_escapes")
@@ -35,15 +35,13 @@ _zcalc_line() {
   fi
 
   case $words[1] in
-    (":!"*)
-    if [[ $words[1] = ":!" ]]; then
+    (":"(\\|)"!"*)
+    if [[ $words[1] = ":"(\\|)"!" && CURRENT -gt 1 ]]; then
       shift words
-      (( CURRENT >1 && CURRENT-- ))
+      (( CURRENT-- ))
     else
-      words[1]=${words[1]##:\!}
-      if (( CURRENT == 1 )); then
-	compset -P ":\!"
-      fi
+      words[1]=${words[1]##:(\\|)\!}
+      compset -P ':(\\|)!'
     fi
     _normal
     ;;
-- 
cgit 1.4.1