branch: externals/vertico
commit 8b74fd1f5fde99e35d98e6ada5fb138518018051
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
vertico-multiform-vertical: Extract vertico-multiform--toggle-mode
---
extensions/vertico-multiform.el | 19 +++++++++++--------
extensions/vertico-repeat.el | 4 ++--
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index a508ad9b0f..a8861543a2 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -178,7 +178,7 @@ The keys in LIST can be symbols or regexps."
(apply app)))
(vertico-multiform--toggle 1)))
-(defun vertico-multiform--temporary-mode (mode arg)
+(defun vertico-multiform--toggle-mode-1 (mode arg)
"Enable or disable MODE temporarily in minibuffer given ARG.
ARG can be nil, t, -1, 1 or toggle."
(unless (minibufferp)
@@ -199,21 +199,24 @@ ARG can be nil, t, -1, 1 or toggle."
(setcar vertico-multiform--stack (remove mode modes))
(push not-mode (car vertico-multiform--stack))))))
-(defun vertico-multiform-vertical (&optional mode)
- "Toggle to display MODE temporarily in minibuffer.
-MODE defaults to the vertical display."
- (interactive)
+(defun vertico-multiform--toggle-mode (mode)
+ "Toggle to display MODE temporarily in minibuffer."
(let (last)
(dolist (m vertico-multiform--display-modes)
(when (and (boundp m) (symbol-value m))
(setq last m)
- (vertico-multiform--temporary-mode m -1)))
+ (vertico-multiform--toggle-mode-1 m -1)))
(when (eq last mode)
(setq mode vertico-multiform--display-last))
(when mode
- (vertico-multiform--temporary-mode mode 1))
+ (vertico-multiform--toggle-mode-1 mode 1))
(setq vertico-multiform--display-last last)))
+(defun vertico-multiform-vertical ()
+ "Toggle to vertical display."
+ (interactive)
+ (vertico-multiform--toggle-mode nil))
+
;; unobtrusive must come after flat
(dolist (name '(buffer flat grid reverse unobtrusive vertical))
(let ((toggle (intern (format "vertico-multiform-%s" name)))
@@ -221,7 +224,7 @@ MODE defaults to the vertical display."
(unless (eq name 'vertical)
(let ((mode (intern (format "vertico-%s-mode" name))))
(defalias toggle
- (lambda () (interactive) (vertico-multiform-vertical mode))
+ (lambda () (interactive) (vertico-multiform--toggle-mode mode))
(format "Toggle the %s display." name))
(push mode vertico-multiform--display-modes)))
(put toggle 'completion-predicate #'vertico--command-p)
diff --git a/extensions/vertico-repeat.el b/extensions/vertico-repeat.el
index a822b37683..2b6a9f3d4c 100644
--- a/extensions/vertico-repeat.el
+++ b/extensions/vertico-repeat.el
@@ -138,8 +138,8 @@
(mode (seq-find #'symbolp (cddr session)))
((bound-and-true-p vertico-multiform-mode))
((not (and (boundp mode) (symbol-value mode)))))
- (declare-function vertico-multiform-vertical "ext:vertico-multiform")
- (vertico-multiform-vertical mode))
+ (declare-function vertico-multiform--toggle-mode "ext:vertico-multiform")
+ (vertico-multiform--toggle-mode mode))
(vertico--exhibit))
(defun vertico-repeat--run (session)
