From 235ad55ba12cb1ea47217894ce3af53cfb4075b6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 7 Jun 2020 13:58:06 -0400 Subject: [PATCH] Force counsel-rg-base-command to be a list Counsel allows `counsel-rg-base-command' to be a string or list. This backwards compatibility is a maintenance burden for Doom, so it's simpler to force it to always be a list. --- modules/completion/ivy/config.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 686c9be36..4fdb082d2 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -207,6 +207,12 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." ;; of its own, on top of the defaults. (setq ivy-initial-inputs-alist nil) + ;; REVIEW Counsel allows `counsel-rg-base-command' to be a string or list. + ;; This backwards compatibility complicates things for Doom. Simpler to + ;; just force it to always be a list. + (when (stringp counsel-rg-base-command) + (setq counsel-rg-base-command (split-string counsel-rg-base-command))) + ;; REVIEW Fix #3215: prevents mingw on Windows throwing an error trying to ;; expand / to an absolute path. Remove this when it is fixed upstream ;; in counsel.