From fd25b24df6b4f098944c4994195d3894a27a8208 Mon Sep 17 00:00:00 2001
From: Sven Wischnowsky <wischnow@users.sourceforge.net>
Date: Wed, 31 May 2000 09:38:25 +0000
Subject: use compadd -[ak] (11549)

---
 Completion/X/_x_color     | 4 ++--
 Completion/X/_x_cursor    | 4 ++--
 Completion/X/_x_extension | 2 +-
 Completion/X/_x_font      | 2 +-
 Completion/X/_x_keysym    | 2 +-
 Completion/X/_xutils      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Completion/X')

diff --git a/Completion/X/_x_color b/Completion/X/_x_color
index 8df656fe1..c4e54363d 100644
--- a/Completion/X/_x_color
+++ b/Completion/X/_x_color
@@ -31,5 +31,5 @@ if (( ! $+_color_cache )); then
 fi
 
 _wanted colors expl 'color specification' \
-    compadd "$@" -M 'm:{a-z}={A-Z} m:-=\  r:[^ A-Z0-9]||[ A-Z0-9]=* r:|=*' - \
-            "$_color_cache[@]"
+    compadd "$@" -M 'm:{a-z}={A-Z} m:-=\  r:[^ A-Z0-9]||[ A-Z0-9]=* r:|=*' -a \
+            _color_cache
diff --git a/Completion/X/_x_cursor b/Completion/X/_x_cursor
index 59ecb5976..5346710d7 100644
--- a/Completion/X/_x_cursor
+++ b/Completion/X/_x_cursor
@@ -14,5 +14,5 @@ if (( ! $+_cursor_cache )); then
   fi
 fi
 
-_description expl 'cursor name'
-compadd "$@" "$expl[@]" -M 'm:-=_ r:|_=*' - "$_cursor_cache[@]"
+_wanted cursors expl 'cursor name' \
+    compadd "$@" -M 'm:-=_ r:|_=*' -a _cursor_cache
diff --git a/Completion/X/_x_extension b/Completion/X/_x_extension
index 5b742a78c..690226975 100644
--- a/Completion/X/_x_extension
+++ b/Completion/X/_x_extension
@@ -15,5 +15,5 @@ else
   [[ "$1" = - ]] && shift
 
   _wanted extensions expl 'X extensions' \
-      compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' - "$_xe_cache[@]"
+      compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' - _xe_cache
 fi
diff --git a/Completion/X/_x_font b/Completion/X/_x_font
index 228542bd2..92dc1ade4 100644
--- a/Completion/X/_x_font
+++ b/Completion/X/_x_font
@@ -13,4 +13,4 @@ if (( ! $+_font_cache )); then
 fi
 
 _wanted fonts expl font \
-    compadd -M 'r:|-=* r:|=*' "$@" -S '' - "$_font_cache[@]"
+    compadd -M 'r:|-=* r:|=*' "$@" -S '' -a _font_cache
diff --git a/Completion/X/_x_keysym b/Completion/X/_x_keysym
index 8d4cfa1f8..39fbaebdd 100644
--- a/Completion/X/_x_keysym
+++ b/Completion/X/_x_keysym
@@ -19,4 +19,4 @@ if (( ! $+_keysym_cache )); then
 fi
 
 _wanted keysyms expl 'key symbol' \
-    compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' - $_keysym_cache
+    compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' -a _keysym_cache
diff --git a/Completion/X/_xutils b/Completion/X/_xutils
index 09fafd5d4..bba73a3ee 100644
--- a/Completion/X/_xutils
+++ b/Completion/X/_xutils
@@ -73,7 +73,7 @@ xhost)
       _tags displays
       while _tags; do
         while _next_label displays expl 'disallow access'; do
-	  { compadd "$expl[@]" -M 'm:{a-z}={A-Z} r:|[:.]=* r:|=*' - $tmp ||
+	  { compadd "$expl[@]" -M 'm:{a-z}={A-Z} r:|[:.]=* r:|=*' -a tmp ||
             _hosts "$expl[@]" } && ret=0
         done
 	(( ret )) || return 0
-- 
cgit 1.4.1