summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-04-20 00:37:20 -0700
committerGlenn Morris <rgm@gnu.org>2010-04-20 00:37:20 -0700
commitd2c7b917066072d1780dfc8200bd749b3965f835 (patch)
tree282562ee9b579d18ff744d1bbc4f71ec971776b6
parent958631c4cc36e766b98c05b05735cb83dce6fbb8 (diff)
downloademacs-d2c7b917066072d1780dfc8200bd749b3965f835.tar.gz
* minibuffer.el (completion-at-point): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/minibuffer.el4
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)))