[Emacs-diffs] /srv/bzr/emacs/trunk r105990: * lisp/minibuffer.el (completion-category-overrides): Fix type of styles

[Stefan Monnier]

------------------------------------------------------------
revno: 105990
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9660
author: Stephen Berman <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-03 10:47:40 -0400
message:
  * lisp/minibuffer.el (completion-category-overrides): Fix type of styles
  and add more user friendly tags.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-03 14:18:42 +0000
+++ b/lisp/ChangeLog    2011-10-03 14:47:40 +0000
@@ -1,3 +1,8 @@
+2011-10-03  Stephen Berman  <address@hidden>
+
+       * minibuffer.el (completion-category-overrides): Fix type of styles
+       and add more user friendly tags (bug#9660).
+
 2011-10-03  Stefan Monnier  <address@hidden>
 
        * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661).

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2011-09-27 18:51:05 +0000
+++ b/lisp/minibuffer.el        2011-10-03 14:47:40 +0000
@@ -498,15 +498,19 @@
 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"))))))