diff --git a/emacs-config.org b/emacs-config.org index 9e22dc6..4c67d80 100644 --- a/emacs-config.org +++ b/emacs-config.org @@ -1213,44 +1213,11 @@ Idk I think this came from the vertico readme :hook (embark-collect-mode . consult-preview-at-point-mode)) - ;; https://github.com/oantolin/embark/wiki/Additional-Configuration#use-which-key-like-a-key-menu-prompt - (defun embark-which-key-indicator () - "An embark indicator that displays keymaps using which-key. - The which-key help message will show the type and value of the - current target followed by an ellipsis if there are further - targets." - (lambda (&optional keymap targets prefix) - (if (null keymap) - (which-key--hide-popup-ignore-command) - (which-key--show-keymap - (if (eq (plist-get (car targets) :type) 'embark-become) - "Become" - (format "Act on %s '%s'%s" - (plist-get (car targets) :type) - (embark--truncate-target (plist-get (car targets) :target)) - (if (cdr targets) "…" ""))) - (if prefix - (pcase (lookup-key keymap prefix 'accept-default) - ((and (pred keymapp) km) km) - (_ (key-binding prefix 'accept-default))) - keymap) - nil nil t (lambda (binding) - (not (string-suffix-p "-argument" (cdr binding)))))))) - + ;; Use mixed indicator: minimal prompt that switches to completing-read for narrowing (setq embark-indicators - '(embark-which-key-indicator + '(embark-mixed-indicator embark-highlight-indicator embark-isearch-highlight-indicator)) - - (defun embark-hide-which-key-indicator (fn &rest args) - "Hide the which-key indicator immediately when using the completing-read prompter." - (which-key--hide-popup-ignore-command) - (let ((embark-indicators - (remq #'embark-which-key-indicator embark-indicators))) - (apply fn args))) - - (advice-add #'embark-completing-read-prompter - :around #'embark-hide-which-key-indicator) #+end_src #+RESULTS: