diff --git a/core/core-projects.el b/core/core-projects.el index d4ba241a3..23af34487 100644 --- a/core/core-projects.el +++ b/core/core-projects.el @@ -138,7 +138,7 @@ c) are not valid projectile projects." (setq projectile-generic-command (concat (format "%s . -0 -H -E .git --color=never --type file --type symlink --follow" doom-projectile-fd-binary) - (if IS-WINDOWS " --path-separator=/")) + (if IS-WINDOWS " --path-separator=//")) projectile-git-command projectile-generic-command projectile-git-submodule-command nil ;; ensure Windows users get fd's benefits @@ -151,7 +151,7 @@ c) are not valid projectile projects." (cl-loop for dir in projectile-globally-ignored-directories concat " --glob " concat (shell-quote-argument (concat "!" dir))) - (if IS-WINDOWS " --path-separator /")) + (if IS-WINDOWS " --path-separator //")) projectile-git-command projectile-generic-command projectile-git-submodule-command nil ;; ensure Windows users get rg's benefits diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 24dd8ffbe..4b4a7562c 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -207,6 +207,14 @@ 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 Fix #3215: prevents mingw throwing an error trying to expand / to an + ;; absolute path. Remove this when it is fixed upstream in counsel. + (when (memq system-type '(windows-nt ms-dos)) + (setq counsel-rg-base-command + (replace-regexp-in-string "--path-separator /" + "--path-separator //" + counsel-rg-base-command))) + ;; Integrate with `helpful' (setq counsel-describe-function-function #'helpful-callable counsel-describe-variable-function #'helpful-variable)