12 files changed, 17 insertions, 17 deletions
diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils
index e286dd3b3..183f5efb9 100644
--- a/Completion/X/Command/_x_utils
+++ b/Completion/X/Command/_x_utils
@@ -88,9 +88,9 @@ xhost)
 
       case "$type" in
       inet) _hosts && ret=0;;
-      dnet) _message 'DECnet host';;
-      nis)  _message 'Secure RPC network name';;
-      krb)  _message 'Kerberos V5 principal';;
+      dnet) _message -e decnet-hosts 'DECnet host';;
+      nis)  _message -e network-names 'Secure RPC network name';;
+      krb)  _message -e principals 'Kerberos V5 principal';;
       esac
     else
       _alternative \
diff --git a/Completion/X/Command/_xauth b/Completion/X/Command/_xauth
index d702e5f0a..14dfc8400 100644
--- a/Completion/X/Command/_xauth
+++ b/Completion/X/Command/_xauth
@@ -37,9 +37,9 @@ while [[ -n "$state" ]]; do
 	  state=protocolname
 	else
 	  case "$words[CURRENT-1]" in
-	  timeout) _message 'timeout(seconds)';;
-	  group) _message 'group-id';;
-	  data) _message 'hexdata';;
+	  timeout) _message -e values 'timeout (seconds)';;
+	  group) _message -e ids 'group-id';;
+	  data) _message -e values 'hexdata';;
 	  *) 
 	    _wanted options expl 'xauth generate options' \
 	      compadd trusted untrusted timeout group data && ret=0
diff --git a/Completion/X/Command/_xmodmap b/Completion/X/Command/_xmodmap
index 5c7fcf3fe..928b6b243 100644
--- a/Completion/X/Command/_xmodmap
+++ b/Completion/X/Command/_xmodmap
@@ -27,7 +27,7 @@ if [[ -n "$state" ]]; then
 	PREFIX=''
 	compadd -S ' ' '=' && ret=0
       else
-        _message 'key code or `any'"'"
+        _message -e keys 'key code or `any'"'"
       fi
       ;;
     keysym*)
diff --git a/Completion/X/Command/_xwit b/Completion/X/Command/_xwit
index 8676ef484..5c6a7f650 100644
--- a/Completion/X/Command/_xwit
+++ b/Completion/X/Command/_xwit
@@ -70,9 +70,9 @@ _regex_arguments _xwit_parse \
      "/$word/" ':option-iconmove-y:y:' \
   \| "/-id$nul/" "$guard" "/$word/" ':option-id:window id:_x_window' \
   \| "/-(no|)keyrepeat$nul/" "$guard" \
-      \( "/[0-9]##$nul/" ':option-keyrepeat-keycode:keycode:{[[ -prefix [0-9]# ]] && _message keycode}' \
+      \( "/[0-9]##$nul/" ':option-keyrepeat-keycode:keycode:{[[ -prefix [0-9]# ]] && _message -e keycodes keycode}' \
 	\( "/-$nul/" "/[0-9]##$nul/" \
-	   ':option-keyrepeat-last-keycode:last keycode:{[[ -prefix [0-9]# ]] && _message "last keycode"}' \| \) \) \# \
+	   ':option-keyrepeat-last-keycode:last keycode:{[[ -prefix [0-9]# ]] && _message -e keycodes "last keycode"}' \| \) \) \# \
   \| "/-names$nul/" "$guard" \
      "/$word/" ':option-names:window name:_x_window -n' \# \
   \| "/[]/" ':options:option:_xwit_compopts' \
diff --git a/Completion/X/Type/_x_borderwidth b/Completion/X/Type/_x_borderwidth
index c2f0eec83..9e20f0258 100644
--- a/Completion/X/Type/_x_borderwidth
+++ b/Completion/X/Type/_x_borderwidth
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'border width'
+  _message -e values 'border width'
 fi
diff --git a/Completion/X/Type/_x_geometry b/Completion/X/Type/_x_geometry
index a15dd16d9..32ea9cb1a 100644
--- a/Completion/X/Type/_x_geometry
+++ b/Completion/X/Type/_x_geometry
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'geometry'
+  _message -e geometries 'geometry'
 fi
diff --git a/Completion/X/Type/_x_locale b/Completion/X/Type/_x_locale
index 2321b1a5b..be8eded8d 100644
--- a/Completion/X/Type/_x_locale
+++ b/Completion/X/Type/_x_locale
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'locale'
+  _message -e locales 'locale'
 fi
diff --git a/Completion/X/Type/_x_name b/Completion/X/Type/_x_name
index 38d4c26d3..58626fde6 100644
--- a/Completion/X/Type/_x_name
+++ b/Completion/X/Type/_x_name
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'name'
+  _message -e names 'name'
 fi
diff --git a/Completion/X/Type/_x_resource b/Completion/X/Type/_x_resource
index a0b8e0f21..0aa3ae9ac 100644
--- a/Completion/X/Type/_x_resource
+++ b/Completion/X/Type/_x_resource
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'resource'
+  _message -e resources 'resource'
 fi
diff --git a/Completion/X/Type/_x_selection_timeout b/Completion/X/Type/_x_selection_timeout
index d6dfd8a13..6430b301e 100644
--- a/Completion/X/Type/_x_selection_timeout
+++ b/Completion/X/Type/_x_selection_timeout
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'selection timeout'
+  _message -e values 'selection timeout'
 fi
diff --git a/Completion/X/Type/_x_title b/Completion/X/Type/_x_title
index fe2ab7b9f..fd73db68c 100644
--- a/Completion/X/Type/_x_title
+++ b/Completion/X/Type/_x_title
@@ -5,5 +5,5 @@ local x="$argv[(I)-X]"
 if (( x )); then
   _message -r "$argv[x + 1]"
 else
-  _message 'title'
+  _message -e titles 'title'
 fi
diff --git a/Completion/X/Type/_xt_session_id b/Completion/X/Type/_xt_session_id
index fcb0192ef..3db911c7e 100644
--- a/Completion/X/Type/_xt_session_id
+++ b/Completion/X/Type/_xt_session_id
@@ -1,3 +1,3 @@
 #autoload
 
-_message 'session ID'
+_message -e ids 'session ID'