summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-04-10 09:07:16 -0700
committerGlenn Morris <rgm@gnu.org>2019-04-10 09:07:16 -0700
commit61cdadf5bc211749002508b0597bb1239024f0d4 (patch)
treee922ab092c165b6582777203a1d0408c22b5d5ac /lisp
parentfe552f69ae7a8bbe22385f690f6bf81a955f9c7f (diff)
parent59994015f194985dbcb7f45a874c7646a223d49e (diff)
downloademacs-61cdadf5bc211749002508b0597bb1239024f0d4.tar.gz
Merge from origin/emacs-26
5999401 (origin/emacs-26) Note that choose-completion-string-function... 8d2f1df Address name conflicts in EIEIO documentation (bug#31660)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/simple.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 857e0fc001b..223e0116aee 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8206,6 +8206,9 @@ CHOICE - the string to insert in the buffer,
BUFFER - the buffer in which the choice should be inserted,
BASE-POSITION - where to insert the completion.
+Functions should also accept and ignore a potential fourth
+argument, passed for backwards compatibility.
+
If a function in the list returns non-nil, that function is supposed
to have inserted the CHOICE in the BUFFER, and possibly exited
the minibuffer; no further functions will be called.