diff options
| author | Glenn Morris | 2012-02-23 00:32:18 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-02-23 00:32:18 -0800 |
| commit | 49fe4321fbdf9bcb57b0b228c7d90e550128824c (patch) | |
| tree | 27e491f8acf008982715418b23a8d70774f48f6f /lisp | |
| parent | 8e911f6f933455fd1d6709dd60965fb9191e81d6 (diff) | |
| download | emacs-49fe4321fbdf9bcb57b0b228c7d90e550128824c.tar.gz emacs-49fe4321fbdf9bcb57b0b228c7d90e550128824c.zip | |
Checked mini.texi
* doc/emacs/mini.texi (Minibuffer File, Completion Options, Repetition):
Copyedits.
(Completion Example): Other M-x au* commands may be defined.
(Completion Styles): Mention emacs21 and completion-category-overrides.
* lisp/minibuffer.el (completion-category-overrides): Doc fix.
* admin/FOR-RELEASE: Related markup.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f8fd60deaa..7e7588d69e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,10 @@ | |||
| 3 | * emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun | 3 | * emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun |
| 4 | when it might call us back infinitely (bug#10797). | 4 | when it might call us back infinitely (bug#10797). |
| 5 | 5 | ||
| 6 | 2012-02-23 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * minibuffer.el (completion-category-overrides): Doc fix. | ||
| 9 | |||
| 6 | 2012-02-23 Stefan Monnier <monnier@iro.umontreal.ca> | 10 | 2012-02-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 11 | ||
| 8 | * minibuffer.el (completion-table-with-context): Fix inf-loop. | 12 | * minibuffer.el (completion-table-with-context): Fix inf-loop. |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 2414baf8e3c..9ee29a7e20c 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -510,7 +510,9 @@ styles for specific categories, such as files, buffers, etc." | |||
| 510 | Each override has the shape (CATEGORY . ALIST) where ALIST is | 510 | Each override has the shape (CATEGORY . ALIST) where ALIST is |
| 511 | an association list that can specify properties such as: | 511 | an association list that can specify properties such as: |
| 512 | - `styles': the list of `completion-styles' to use for that category. | 512 | - `styles': the list of `completion-styles' to use for that category. |
| 513 | - `cycle': the `completion-cycle-threshold' to use for that category." | 513 | - `cycle': the `completion-cycle-threshold' to use for that category. |
| 514 | Categories are symbols such as `buffer' and `file', used when | ||
| 515 | completing buffer and file names, respectively." | ||
| 514 | :version "24.1" | 516 | :version "24.1" |
| 515 | :type `(alist :key-type (choice :tag "Category" | 517 | :type `(alist :key-type (choice :tag "Category" |
| 516 | (const buffer) | 518 | (const buffer) |