2 files changed, 15 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7258eec2a4..0dab1a4f224 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-03  Stephen Berman  <stephen.berman@gmx.net>
+
+        * minibuffer.el (completion-category-overrides): Fix type of styles
+        and add more user friendly tags (bug#9660).
+
 2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661).
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 021e46d5053..ba07a119d92 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -498,15 +498,19 @@ Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
 - `cycle': the `completion-cycle-threshold' to use for that category."
-  :type `(alist :key-type (choice (const buffer)
+  :type `(alist :key-type (choice :tag "Category"
+                                  (const buffer)
                                   (const file)
                                   symbol)
           :value-type
-          (set
-           (cons (const style)
-                 (repeat ,@(mapcar (lambda (x) (list 'const (car x)))
-                                   completion-styles-alist)))
-           (cons (const cycle)
+          (set :tag "Properties to override"
+           (cons :tag "Completion Styles"
+                 (const :tag "Select a style from the menu;" styles)
+                 (repeat :tag "insert a new menu to add more styles"
+                         (choice ,@(mapcar (lambda (x) (list 'const (car x)))
+                                           completion-styles-alist))))
+           (cons :tag "Completion Cycling"
+                 (const :tag "Select one value from the menu." cycle)
                  (choice (const :tag "No cycling" nil)
                          (const :tag "Always cycle" t)
                          (integer :tag "Threshold"))))))