From 0ba8ae87eac21281e0b17eb9cbb523d133067a4a Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Wed, 8 Jun 2005 12:45:24 +0000
Subject: 21315: make completion functions give precendence to descriptions
 passed as parameters and cleanup descriptons in calling functions

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

(limited to 'Completion/X')

diff --git a/Completion/X/Type/_x_cursor b/Completion/X/Type/_x_cursor
index 5346710d7..466aea0c2 100644
--- a/Completion/X/Type/_x_cursor
+++ b/Completion/X/Type/_x_cursor
@@ -15,4 +15,4 @@ if (( ! $+_cursor_cache )); then
 fi
 
 _wanted cursors expl 'cursor name' \
-    compadd "$@" -M 'm:-=_ r:|_=*' -a _cursor_cache
+    compadd "$@" -M 'm:-=_ r:|_=*' -a - _cursor_cache
diff --git a/Completion/X/Type/_x_extension b/Completion/X/Type/_x_extension
index d1a299e8b..4e410a82b 100644
--- a/Completion/X/Type/_x_extension
+++ b/Completion/X/Type/_x_extension
@@ -9,11 +9,11 @@ _tags extensions || return 1
 if [[ "$1" = -a ]]; then
   shift
 
-  _wanted extensions expl 'X extensions' \
+  _wanted extensions expl 'X extension' \
       compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' - all "$_xe_cache[@]"
 else
   [[ "$1" = - ]] && shift
 
-  _wanted extensions expl 'X extensions' \
-      compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' -a _xe_cache
+  _wanted extensions expl 'X extension' \
+      compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' -a - _xe_cache
 fi
diff --git a/Completion/X/Type/_x_font b/Completion/X/Type/_x_font
index 6208faaca..134cfdf1c 100644
--- a/Completion/X/Type/_x_font
+++ b/Completion/X/Type/_x_font
@@ -13,4 +13,4 @@ if (( ! $+_font_cache )); then
 fi
 
 _wanted fonts expl font \
-    compadd -M 'r:|-=* r:|=*' "$@" -S '' -a _font_cache
+    compadd -M 'r:|-=* r:|=*' "$@" -S '' -a - _font_cache
diff --git a/Completion/X/Type/_x_keysym b/Completion/X/Type/_x_keysym
index 39fbaebdd..84212e71b 100644
--- a/Completion/X/Type/_x_keysym
+++ b/Completion/X/Type/_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:|=*' -a _keysym_cache
+    compadd "$@" -M 'm:{a-z}={A-Z} r:|-=* r:|=*' -a - _keysym_cache
-- 
cgit 1.4.1