From 6bd8cbf903c5573d1bde1f2ec1bc0222285cc854 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Sep 2022 17:33:44 +0200 Subject: [PATCH] fix(vertico): relax doctor tests consult--grep-lookahead-p throws an error if argv[0] can't be found, and so will require if consult isn't installed (which would be redundant with the package checks the doctor already does). To prevent misleading backtraces here, I've suppressed the latter issue, but the former will need attention later. --- modules/completion/vertico/doctor.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/completion/vertico/doctor.el b/modules/completion/vertico/doctor.el index 06806a39e..febc9702d 100644 --- a/modules/completion/vertico/doctor.el +++ b/modules/completion/vertico/doctor.el @@ -1,11 +1,12 @@ ;;; completion/vertico/doctor.el -*- lexical-binding: t; -*- -(require 'consult) +(when (require 'consult nil t) + ;; FIXME: This throws an error if grep is missing. + (unless (consult--grep-lookahead-p "grep" "-P") + (warn! "The installed grep binary was not built with support for PCRE lookaheads") + (explain! "Some advanced consult filtering features will not work as a result, see the module readme.")) -(unless (consult--grep-lookahead-p "grep" "-P") - (warn! "The installed grep binary was not built with support for PCRE lookaheads. - Some advanced consult filtering features will not work as a result, see the module readme.")) - -(unless (consult--grep-lookahead-p "rg" "-P") - (warn! "The installed ripgrep binary was not built with support for PCRE lookaheads. - Some advanced consult filtering features will not work as a result, see the module readme.")) + ;; TODO: Move this to core in v3.0 + (unless (consult--grep-lookahead-p "rg" "-P") + (warn! "The installed ripgrep binary was not built with support for PCRE lookaheads.") + (explain! "Some advanced consult filtering features will not work as a result, see the module readme.")))