aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 18:07:30 +0200
committerLars Magne Ingebrigtsen2011-07-02 18:07:30 +0200
commit08549772c2c28b138afc71718000ae76f0bab797 (patch)
treee80d771b16abfd068bafc25a6568ba4cf5cf596b
parent48954a094fa8e0e8022fd2d6bd3a45967e46e23f (diff)
downloademacs-08549772c2c28b138afc71718000ae76f0bab797.tar.gz
emacs-08549772c2c28b138afc71718000ae76f0bab797.zip
* minibuffer.el (completion-in-region): Document PREDICATE
(bug#7136).
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/minibuffer.el4
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf520f5d21b..cd1ec32d077 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * minibuffer.el (completion-in-region): Document PREDICATE
4 (bug#7136).
5
3 * info-look.el (info-lookup-add-help): Clarify that ARGS is a list 6 * info-look.el (info-lookup-add-help): Clarify that ARGS is a list
4 of keyword/argument pairs (bug#6904). 7 of keyword/argument pairs (bug#6904).
5 8
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 1700b90eb1e..d62b377954d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1442,7 +1442,9 @@ we entered `completion-in-region-mode'.")
1442(defun completion-in-region (start end collection &optional predicate) 1442(defun completion-in-region (start end collection &optional predicate)
1443 "Complete the text between START and END using COLLECTION. 1443 "Complete the text between START and END using COLLECTION.
1444Return nil if there is no valid completion, else t. 1444Return nil if there is no valid completion, else t.
1445Point needs to be somewhere between START and END." 1445Point needs to be somewhere between START and END.
1446PREDICATE (a function called with no arguments) says when to
1447exit."
1446 (assert (<= start (point)) (<= (point) end)) 1448 (assert (<= start (point)) (<= (point) end))
1447 (with-wrapper-hook 1449 (with-wrapper-hook
1448 ;; FIXME: Maybe we should use this hook to provide a "display 1450 ;; FIXME: Maybe we should use this hook to provide a "display