diff options
| author | Chong Yidong | 2012-02-15 21:45:02 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-02-15 21:45:02 +0800 |
| commit | 60236b0dca0416202da5c3e39564b85b2ae3c9fa (patch) | |
| tree | 64a7ddc4416b0010b37b3edec55495331275ce9d /lisp | |
| parent | 888ab66104667346aff8a1569b924fe92daac7e2 (diff) | |
| download | emacs-60236b0dca0416202da5c3e39564b85b2ae3c9fa.tar.gz emacs-60236b0dca0416202da5c3e39564b85b2ae3c9fa.zip | |
Docstring and manual updates for completion-at-point-functions.
* doc/lispref/minibuf.texi (Basic Completion): Define "completion table".
Move completion-in-region to Completion in Buffers node.
(Completion Commands): Use "completion table" terminology.
(Completion in Buffers): New node.
* doc/lispref/modes.texi (Hooks): add-hook can be used for abnormal hooks too.
(Setting Hooks): Update minor mode usage example.
(Major Mode Conventions): Note that completion-at-point-functions
should be altered locally. Add xref to Completion in Buffers.
* lisp/minibuffer.el (completion-at-point-functions): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ccb1394e3d5..bdbe99d5452 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | 2012-02-15 Chong Yidong <cyd@gnu.org> | 6 | 2012-02-15 Chong Yidong <cyd@gnu.org> |
| 7 | 7 | ||
| 8 | * minibuffer.el (completion-at-point-functions): Doc fix. | ||
| 9 | |||
| 8 | * custom.el (defcustom): Doc fix; note use of defvar. | 10 | * custom.el (defcustom): Doc fix; note use of defvar. |
| 9 | 11 | ||
| 10 | 2012-02-15 Glenn Morris <rgm@gnu.org> | 12 | 2012-02-15 Glenn Morris <rgm@gnu.org> |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 611df1eb6d9..8564cc2009b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -1550,16 +1550,16 @@ the mode if ARG is omitted or nil." | |||
| 1550 | Each function on this hook is called in turns without any argument and should | 1550 | Each function on this hook is called in turns without any argument and should |
| 1551 | return either nil to mean that it is not applicable at point, | 1551 | return either nil to mean that it is not applicable at point, |
| 1552 | or a function of no argument to perform completion (discouraged), | 1552 | or a function of no argument to perform completion (discouraged), |
| 1553 | or a list of the form (START END COLLECTION &rest PROPS) where | 1553 | or a list of the form (START END COLLECTION . PROPS) where |
| 1554 | START and END delimit the entity to complete and should include point, | 1554 | START and END delimit the entity to complete and should include point, |
| 1555 | COLLECTION is the completion table to use to complete it, and | 1555 | COLLECTION is the completion table to use to complete it, and |
| 1556 | PROPS is a property list for additional information. | 1556 | PROPS is a property list for additional information. |
| 1557 | Currently supported properties are all the properties that can appear in | 1557 | Currently supported properties are all the properties that can appear in |
| 1558 | `completion-extra-properties' plus: | 1558 | `completion-extra-properties' plus: |
| 1559 | `:predicate' a predicate that completion candidates need to satisfy. | 1559 | `:predicate' a predicate that completion candidates need to satisfy. |
| 1560 | `:exclusive' If `no', means that if the completion data does not match the | 1560 | `:exclusive' If `no', means that if the completion table fails to |
| 1561 | text at point failure, then instead of reporting a completion failure, | 1561 | match the text at point, then instead of reporting a completion |
| 1562 | the completion should try the next completion function.") | 1562 | failure, the completion should try the next completion function.") |
| 1563 | 1563 | ||
| 1564 | (defvar completion--capf-misbehave-funs nil | 1564 | (defvar completion--capf-misbehave-funs nil |
| 1565 | "List of functions found on `completion-at-point-functions' that misbehave. | 1565 | "List of functions found on `completion-at-point-functions' that misbehave. |