From 04e96c6faf2d7bda9056711e585b8c6a263af22c Mon Sep 17 00:00:00 2001 From: "Itai Y. Efrat" Date: Sun, 10 Oct 2021 10:46:14 +0300 Subject: [PATCH 1/2] bump: :completion vertico iyefrat/all-the-icons-completion@96500418541b -> iyefrat/all-the-icons-completion@a0f34d68cc12 minad/consult@dc6e45586194 -> minad/consult@166e3b03c3de minad/marginalia@cb1d3ba604dd -> minad/marginalia@fbd2f378f532 minad/vertico@0df75c0bbc54 -> minad/vertico@cd3c400aac2f oantolin/embark@1492aefc00ab -> oantolin/embark@8a0b80c6e6ec Add --null to consult-ripgrep-args to comply with upstream changes to filename detection. Update +vertico-embark-which-key-indicator. Fix #5494 Fix #5547 --- modules/completion/vertico/autoload/vertico.el | 10 +++++++--- modules/completion/vertico/packages.el | 12 ++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/completion/vertico/autoload/vertico.el b/modules/completion/vertico/autoload/vertico.el index b85595a51..cdd8ce67a 100644 --- a/modules/completion/vertico/autoload/vertico.el +++ b/modules/completion/vertico/autoload/vertico.el @@ -44,7 +44,7 @@ orderless." (concat "rg " (if all-files "-uu ") (unless recursive "--maxdepth 1 ") - "--line-buffered --color=never --max-columns=1000 " + "--null --line-buffered --color=never --max-columns=1000 " "--path-separator / --smart-case --no-heading --line-number " "--hidden -g !.git " (mapconcat #'shell-quote-argument args " ") @@ -209,7 +209,7 @@ current target followed by an ellipsis if there are further targets." (lambda (&optional keymap targets prefix) (if (null keymap) - (kill-buffer which-key--buffer) + (which-key--hide-popup-ignore-command) (which-key--show-keymap (if (eq (caar targets) 'embark-become) "Become" @@ -217,7 +217,11 @@ targets." (plist-get (car targets) :type) (embark--truncate-target (plist-get (car targets) :target)) (if (cdr targets) "…" ""))) - (if prefix (lookup-key keymap prefix) keymap) + (if prefix + (pcase (lookup-key keymap prefix 'accept-default) + ((and (pred keymapp) km) km) + (_ (key-binding prefix 'accept-default))) + keymap) nil nil t)))) ;;;###autoload diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el index 16a53aa12..65793d736 100644 --- a/modules/completion/vertico/packages.el +++ b/modules/completion/vertico/packages.el @@ -4,20 +4,20 @@ (package! vertico :recipe (:host github :repo "minad/vertico" :files ("*.el" "extensions/*.el")) - :pin "0df75c0bbc545b1bd008718b1af2e6c0df18fe74") + :pin "cd3c400aac2f5435080dc55d13c03c8886241365") (package! orderless :pin "62f71c34baca0b7d0adeab4a1c07d85ffcee80d9") -(package! consult :pin "dc6e45586194cb30b3ba7614189718f3db1391c3") +(package! consult :pin "166e3b03c3de4f88bbfdeef7f52efac27642e2d3") (when (featurep! :checkers syntax) (package! consult-flycheck :pin "92b259e6a8ebe6439f67d3d7ffa44b7e64b76478")) -(package! embark :pin "1492aefc00abc3355bf04c2ed05f40ff2f523fcf") -(package! embark-consult :pin "1492aefc00abc3355bf04c2ed05f40ff2f523fcf") +(package! embark :pin "8a0b80c6e6ecdf6bb0df7dc496fe4d03197def65") +(package! embark-consult :pin "8a0b80c6e6ecdf6bb0df7dc496fe4d03197def65") -(package! marginalia :pin "cb1d3ba604dda17d8d44e7355ad76a1651830a30") +(package! marginalia :pin "fbd2f378f532b6d34d95d84b43edabd00e99a472") (package! wgrep :pin "f9687c28bbc2e84f87a479b6ce04407bb97cfb23") (when (featurep! +icons) - (package! all-the-icons-completion :pin "96500418541b7376cd0b3e4583b9509c0dd92b27")) + (package! all-the-icons-completion :pin "a0f34d68cc12330ab3992a7521f9caa1de3b8470")) From 6eb52a8536dc2512c1cfbe29a4e432c06a661e2a Mon Sep 17 00:00:00 2001 From: "Itai Y. Efrat" Date: Sun, 10 Oct 2021 10:47:14 +0300 Subject: [PATCH 2/2] revert: fix(vertico): add +vertico/find-file-in stopgap This is no longer needed since #5494 was fixed. Ref #5494 Revert 8b3b39532d82 --- modules/completion/vertico/config.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index 7c98ae1d0..55dec4678 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -192,11 +192,10 @@ overrides `completion-styles' during company completion sessions.") (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup)) (advice-add #'marginalia--project-root :override #'doom-project-root) (pushnew! marginalia-command-categories - ;; HACK temporarily disabled until #5494 is fixed - ;;'(+default/find-file-under-here. file) - ;;'(doom/find-file-in-emacsd . project-file) - ;;'(doom/find-file-in-other-project . project-file) - ;;'(doom/find-file-in-private-config . file) + '(+default/find-file-under-here. file) + '(doom/find-file-in-emacsd . project-file) + '(doom/find-file-in-other-project . project-file) + '(doom/find-file-in-private-config . file) '(doom/describe-active-minor-mode . minor-mode) '(flycheck-error-list-set-filter . builtin) '(persp-switch-to-buffer . buffer)