From 394f7be6c5415aae74c459ce594bc80520a2a652 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 9 Feb 2022 14:52:37 +0100 Subject: [PATCH] bump: :completion vertico minad/consult@0940ca016531 -> minad/consult@2106eee75f84 minad/marginalia@9229d88ae475 -> minad/marginalia@e9540a7b80f9 minad/vertico@a8fe9a0b2e15 -> minad/vertico@509ca602c7aa oantolin/embark@c9b26c2e18f0 -> oantolin/embark@56e28c23d56d oantolin/orderless@1ccf74ffdbb0 -> oantolin/orderless@ce462a63e32d - Marginalia introduced library annotations in minad/marginalia@5e646cc (minad/marginalia#127), which opens us up to corner cases where decompression of library files (to retrieve their description) fails and brings down vertico with it. marginalia--library-doc has been advised to suppress these errors. Fix: #6099 Ref: minad/marginalia@5e646cc3f6e9 Ref: minad/marginalia#127 --- modules/completion/vertico/config.el | 14 ++++++++++++-- modules/completion/vertico/packages.el | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index 25072452f..4a4220137 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -132,7 +132,7 @@ orderless." +default/search-cwd +default/search-other-cwd +default/search-notes-for-symbol-at-point +default/search-emacsd - consult--source-file consult--source-project-file consult--source-bookmark + consult--source-recent-file consult--source-project-recent-file consult--source-bookmark :preview-key (kbd "C-SPC")) (consult-customize consult-theme @@ -233,7 +233,17 @@ orderless." '(projectile-find-file . project-file) '(projectile-recentf . project-file) '(projectile-switch-to-buffer . buffer) - '(projectile-switch-project . project-file))) + '(projectile-switch-project . project-file)) + + ;; HACK minad/marginalia#127 adds annotation to read-library-name, but + ;; compression errors (or any errors while reading compressed files) will + ;; break completion entirely. This advice suppresses those errors and + ;; degrades gracefully. + ;; TODO PR error handling upstream. + (defadvice! +vertico--suppress-errors-a (fn &rest args) + :around #'marginalia--library-doc + (letf! ((#'jka-compr-error #'ignore)) + (ignore-errors (apply fn args))))) (use-package! embark-consult diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el index f1ae94744..5aab84656 100644 --- a/modules/completion/vertico/packages.el +++ b/modules/completion/vertico/packages.el @@ -4,19 +4,19 @@ (package! vertico :recipe (:host github :repo "minad/vertico" :files ("*.el" "extensions/*.el")) - :pin "a8fe9a0b2e156e022136169a3159b4dad78b2439") + :pin "509ca602c7aa565ab8f54c07e09af8fc3e706108") -(package! orderless :pin "1ccf74ffdbb0dd34caa63022e92f947c09c49c86") +(package! orderless :pin "ce462a63e32dd32bceea041f656bb79da953d62f") -(package! consult :pin "0940ca016531f3412003c231b476e5023a510ff9") +(package! consult :pin "2106eee75f84206715631da45eae08827da266f9") (package! consult-dir :pin "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b") (when (featurep! :checkers syntax) (package! consult-flycheck :pin "0ad7e8ff15683a4d64b79c29b3fcf847edfe244b")) -(package! embark :pin "c9b26c2e18f01ae401df6a69b7a0c1a6bc44b90c") -(package! embark-consult :pin "c9b26c2e18f01ae401df6a69b7a0c1a6bc44b90c") +(package! embark :pin "56e28c23d56da3ae4b755bfa50a181bdedf439e6") +(package! embark-consult :pin "56e28c23d56da3ae4b755bfa50a181bdedf439e6") -(package! marginalia :pin "9229d88ae4757f3439e81f51799758c009838cb4") +(package! marginalia :pin "e9540a7b80f9c4d044748b88720e5cba3e30c20a") (package! wgrep :pin "f9687c28bbc2e84f87a479b6ce04407bb97cfb23")