diff options
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 975194703eb..46196e85a65 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-04-20 Glenn Morris <rgm@gnu.org> + + * minibuffer.el (completion-at-point): Doc fix. + 2010-04-18 Chong Yidong <cyd@stupidchicken.com> * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 9c252134692..93a222053f6 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1163,7 +1163,9 @@ Currently supported properties are: `:annotation-function' the value to use for `completion-annotate-function'.") (defun completion-at-point () - "Complete the thing at point according to local mode." + "Complete the thing at point according to local mode. +This runs the hook `completion-at-point-functions' until a member returns +non-nil." (interactive) (let ((res (run-hook-with-args-until-success 'completion-at-point-functions))) |