[Emacs-diffs] /srv/bzr/emacs/trunk r105944: Improve doc strings for completion styles.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105944
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-27 21:51:05 +0300
message:
  Improve doc strings for completion styles.
  
   lisp/minibuffer.el (completion-styles)
   (completion-category-overrides): Cross reference each other in doc
   strings.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-27 18:09:43 +0000
+++ b/lisp/ChangeLog    2011-09-27 18:51:05 +0000
@@ -1,3 +1,9 @@
+2011-09-27  Eli Zaretskii  <address@hidden>
+
+       * minibuffer.el (completion-styles)
+       (completion-category-overrides): Cross reference each other in doc
+       strings.
+
 2011-09-27  Glenn Morris  <address@hidden>
 
        * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2011-09-20 01:06:29 +0000
+++ b/lisp/minibuffer.el        2011-09-27 18:51:05 +0000
@@ -482,7 +482,10 @@
     ;; and simply add "bar" to the end of the result.
     emacs22)
   "List of completion styles to use.
-The available styles are listed in `completion-styles-alist'."
+The available styles are listed in `completion-styles-alist'.
+
+Note that `completion-category-overrides' may override these
+styles for specific categories, such as files, buffers, etc."
   :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
                                    completion-styles-alist)))
   :group 'minibuffer
@@ -490,7 +493,7 @@
 
 (defcustom completion-category-overrides
   '((buffer (styles . (basic substring))))
-  "List of overrides for specific categories.
+  "List of `completion-styles' overrides for specific categories.
 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.