branch: externals/vertico
commit c5ab3ddc65909dc8bc5c6dd9d275b8912729e265
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Rename never-prompt to no-prompt
---
CHANGELOG.org | 4 ++--
vertico.el | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 66a2ed0ef4..5b9814d026 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -4,8 +4,8 @@
* Development
-- =vertico-preselect=: Add =never-prompt= configuration choice to entirely
disallow
- the selection of the prompt.
+- =vertico-preselect=: Add =no-prompt= configuration choice to entirely
disallow the
+ selection of the prompt.
* Version 1.7 (2024-01-23)
diff --git a/vertico.el b/vertico.el
index e17753342a..c01d84c27f 100644
--- a/vertico.el
+++ b/vertico.el
@@ -66,10 +66,10 @@
(defcustom vertico-preselect 'directory
"Configure if the prompt or first candidate is preselected.
- prompt: Always select the prompt.
-- first: Select the first candidate, but allow prompt selection.
-- never-prompt: Forbid selection of the prompt entirely.
+- first: Select the first candidate, allow prompt selection.
+- no-prompt: Like first, but forbid selection of the prompt entirely.
- directory: Like first, but select the prompt if it is a directory."
- :type '(choice (const prompt) (const first) (const directory) (const
never-prompt)))
+ :type '(choice (const prompt) (const first) (const no-prompt) (const
directory)))
(defcustom vertico-scroll-margin 2
"Number of lines at the top and bottom when scrolling.
@@ -353,7 +353,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and
PRED."
(vertico--candidates . ,all)
(vertico--total . ,(length all))
(vertico--hilit . ,(or hl #'identity))
- (vertico--allow-prompt . ,(and (not (eq vertico-preselect 'never-prompt))
+ (vertico--allow-prompt . ,(and (not (eq vertico-preselect 'no-prompt))
(or def-missing (eq vertico-preselect
'prompt)
(memq minibuffer--require-match
'(nil confirm
confirm-after-completion)))))