diff lisp/minibuffer.el @ 108340:486e3cc1b3a6

Merge from mainline.

--- a/lisp/minibuffer.el	Mon Apr 19 22:42:15 2010 +0000
+++ b/lisp/minibuffer.el	Tue Apr 20 22:41:29 2010 +0000
@@ -1163,7 +1163,9 @@
  `: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)))