aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-09-27 21:51:05 +0300
committerEli Zaretskii2011-09-27 21:51:05 +0300
commit693fbdb629c8cd41253519cf6c68a9b7b7bde493 (patch)
treeb7540b49495ae45cdd507fd8bb389073dcc82d8e
parent8b457e28320da995d51714e40af65ab52d637eb8 (diff)
downloademacs-693fbdb629c8cd41253519cf6c68a9b7b7bde493.tar.gz
emacs-693fbdb629c8cd41253519cf6c68a9b7b7bde493.zip
Improve doc strings for completion styles.
lisp/minibuffer.el (completion-styles) (completion-category-overrides): Cross reference each other in doc strings.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/minibuffer.el7
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b258f1081b0..bdf4522c4f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-09-27 Eli Zaretskii <eliz@gnu.org>
2
3 * minibuffer.el (completion-styles)
4 (completion-category-overrides): Cross reference each other in doc
5 strings.
6
12011-09-27 Glenn Morris <rgm@gnu.org> 72011-09-27 Glenn Morris <rgm@gnu.org>
2 8
3 * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes 9 * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index c6f28b14415..021e46d5053 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -482,7 +482,10 @@ and DOC describes the way this style of completion works.")
482 ;; and simply add "bar" to the end of the result. 482 ;; and simply add "bar" to the end of the result.
483 emacs22) 483 emacs22)
484 "List of completion styles to use. 484 "List of completion styles to use.
485The available styles are listed in `completion-styles-alist'." 485The available styles are listed in `completion-styles-alist'.
486
487Note that `completion-category-overrides' may override these
488styles for specific categories, such as files, buffers, etc."
486 :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x))) 489 :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
487 completion-styles-alist))) 490 completion-styles-alist)))
488 :group 'minibuffer 491 :group 'minibuffer
@@ -490,7 +493,7 @@ The available styles are listed in `completion-styles-alist'."
490 493
491(defcustom completion-category-overrides 494(defcustom completion-category-overrides
492 '((buffer (styles . (basic substring)))) 495 '((buffer (styles . (basic substring))))
493 "List of overrides for specific categories. 496 "List of `completion-styles' overrides for specific categories.
494Each override has the shape (CATEGORY . ALIST) where ALIST is 497Each override has the shape (CATEGORY . ALIST) where ALIST is
495an association list that can specify properties such as: 498an association list that can specify properties such as:
496- `styles': the list of `completion-styles' to use for that category. 499- `styles': the list of `completion-styles' to use for that category.