emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #2351: counsel-rg errors on Windows

Browse source
This commit is contained in:
Henrik Lissner 2020-06-05 00:43:51 -04:00
parent 7a8bf22e41
commit f548ab600c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-projects.el
View file

@ -138,7 +138,7 @@ c) are not valid projectile projects."
(setq projectile-generic-command (setq projectile-generic-command
(concat (format "%s . -0 -H -E .git --color=never --type file --type symlink --follow" (concat (format "%s . -0 -H -E .git --color=never --type file --type symlink --follow"
doom-projectile-fd-binary) doom-projectile-fd-binary)
(if IS-WINDOWS " --path-separator=/")) (if IS-WINDOWS " --path-separator=//"))
projectile-git-command projectile-generic-command projectile-git-command projectile-generic-command
projectile-git-submodule-command nil projectile-git-submodule-command nil
;; ensure Windows users get fd's benefits ;; 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 (cl-loop for dir in projectile-globally-ignored-directories
concat " --glob " concat " --glob "
concat (shell-quote-argument (concat "!" dir))) concat (shell-quote-argument (concat "!" dir)))
(if IS-WINDOWS " --path-separator /")) (if IS-WINDOWS " --path-separator //"))
projectile-git-command projectile-generic-command projectile-git-command projectile-generic-command
projectile-git-submodule-command nil projectile-git-submodule-command nil
;; ensure Windows users get rg's benefits ;; ensure Windows users get rg's benefits

8
modules/completion/ivy/config.el
View file

@ -207,6 +207,14 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
;; of its own, on top of the defaults. ;; of its own, on top of the defaults.
(setq ivy-initial-inputs-alist nil) (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' ;; Integrate with `helpful'
(setq counsel-describe-function-function #'helpful-callable (setq counsel-describe-function-function #'helpful-callable
counsel-describe-variable-function #'helpful-variable) counsel-describe-variable-function #'helpful-variable)