aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2022-03-22 19:56:06 +0200
committerEli Zaretskii2022-03-22 19:56:06 +0200
commitf2047fdca4f42cf0af568e1d62f286a91cce6d35 (patch)
tree63747a05afbcd34a913badef451ad2b25ec1d961 /lisp
parentda3af500ad490db5cded8dfca7f2ec713b52629c (diff)
downloademacs-f2047fdca4f42cf0af568e1d62f286a91cce6d35.tar.gz
emacs-f2047fdca4f42cf0af568e1d62f286a91cce6d35.zip
Fix documentation of the new completion-related features
* etc/NEWS: * lisp/minibuffer.el (completion-auto-help): * doc/lispref/text.texi (Special Properties): * doc/emacs/mini.texi (Completion Options): Fix wording of recently added documentation and customization options.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/minibuffer.el25
1 files changed, 14 insertions, 11 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 00d4560865c..c4fb1c00391 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -894,20 +894,23 @@ If the current buffer is not a minibuffer, erase its entire contents."
894 894
895(defcustom completion-auto-help t 895(defcustom completion-auto-help t
896 "Non-nil means automatically provide help for invalid completion input. 896 "Non-nil means automatically provide help for invalid completion input.
897If the value is t the *Completions* buffer is displayed whenever completion 897If the value is t, the *Completions* buffer is displayed whenever completion
898is requested but cannot be done. 898is requested but cannot be done.
899If the value is `lazy', the *Completions* buffer is only displayed after 899If the value is `lazy', the *Completions* buffer is only displayed after
900the second failed attempt to complete. 900the second failed attempt to complete.
901If the value is 'always', the completion commands are always shown 901If the value is 'always', the *Completions* buffer is always shown
902after a completion attempt, or updated if they are already visible. 902after a completion attempt, and the list of completions is updated if
903If the value is 'visible', then completions are not hidden, but updated 903already visible.
904if they are already visible while the current behavior stays the same 904If the value is 'visible', the *Completions* buffer is displayed
905as default if they are not." 905whenever completion is requested but cannot be done for the first time,
906 :type '(choice (const :tag "Disabled" nil) 906but remains visible thereafter, and the list of completions in it is
907 (const :tag "Enabled legacy" t) 907updated for subsequent attempts to complete.."
908 (const :tag "After a second attempt" lazy) 908 :type '(choice (const :tag "Don't show" nil)
909 (const :tag "Visible update" visible) 909 (const :tag "Show only when cannot complete" t)
910 (const :tag "Always update" always))) 910 (const :tag "Show after second failed completion attempt" lazy)
911 (const :tag
912 "Leave visible after first failed completion" visible)
913 (const :tag "Always visible" always)))
911 914
912(defvar completion-styles-alist 915(defvar completion-styles-alist
913 '((emacs21 916 '((emacs21