aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-08 04:46:09 -0800
committerLars Ingebrigtsen2014-02-08 04:46:09 -0800
commit18c6aa8c86177dcc780c79b640c807d3f5353f25 (patch)
tree94e9f8fa929b18fd20d7b3cd5f4391db5aaffce7
parentdce8463bb99c3a6c037b55ec99d92a68e56cae31 (diff)
downloademacs-18c6aa8c86177dcc780c79b640c807d3f5353f25.tar.gz
emacs-18c6aa8c86177dcc780c79b640c807d3f5353f25.zip
* simple.el (choose-completion-string-functions): Document fix.
New calling convention. Fixes: debbugs:14153
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/simple.el6
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b91474c85f..f18a55ce202 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * simple.el (choose-completion-string-functions): Document new
4 calling convention (bug#14153).
5
3 * kmacro.el (kmacro-exec-ring-item): Doc fix (bug#14198). 6 * kmacro.el (kmacro-exec-ring-item): Doc fix (bug#14198).
4 7
5 * find-dired.el (find-name-dired): Doc fix (bug#14290). 8 * find-dired.el (find-name-dired): Doc fix (bug#14290).
diff --git a/lisp/simple.el b/lisp/simple.el
index 497e69f813d..7576a6861fc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6986,12 +6986,10 @@ With prefix argument N, move N items (negative N means move backward)."
6986 6986
6987(defvar choose-completion-string-functions nil 6987(defvar choose-completion-string-functions nil
6988 "Functions that may override the normal insertion of a completion choice. 6988 "Functions that may override the normal insertion of a completion choice.
6989These functions are called in order with four arguments: 6989These functions are called in order with three arguments:
6990CHOICE - the string to insert in the buffer, 6990CHOICE - the string to insert in the buffer,
6991BUFFER - the buffer in which the choice should be inserted, 6991BUFFER - the buffer in which the choice should be inserted,
6992MINI-P - non-nil if BUFFER is a minibuffer, and 6992BASE-POSITION - where to insert the completion.
6993BASE-SIZE - the number of characters in BUFFER before
6994the string being completed.
6995 6993
6996If a function in the list returns non-nil, that function is supposed 6994If a function in the list returns non-nil, that function is supposed
6997to have inserted the CHOICE in the BUFFER, and possibly exited 6995to have inserted the CHOICE in the BUFFER, and possibly exited