From 85883facf52d9ef02019e996ea78367021856e13 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 5 Jun 2020 01:19:03 -0400 Subject: [PATCH] Bump :completion ivy Yevgnen/ivy-rich@3f818b2 -> Yevgnen/ivy-rich@1097013 abo-abo/swiper@04ca164 -> abo-abo/swiper@544e7de ericdanan/counsel-projectile@126e825 -> ericdanan/counsel-projectile@77392cb tumashu/ivy-posframe@ae9bafe -> tumashu/ivy-posframe@4474956 --- modules/completion/ivy/config.el | 15 ++++++++------- modules/completion/ivy/packages.el | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 5c41f7629..686c9be36 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -207,13 +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))) + ;; 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. + (when (and (memq system-type '(windows-nt ms-dos)) + (listp counsel-rg-base-command) + (member "--path-separator" counsel-rg-base-command)) + (setf (cadr (member "--path-separator" counsel-rg-base-command)) + "//")) ;; Integrate with `helpful' (setq counsel-describe-function-function #'helpful-callable diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index 78f1a9b25..5c19301c1 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -1,14 +1,14 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/ivy/packages.el -(package! swiper :pin "04ca16420053a3a6d34a96f0d680dd449c2e5851") +(package! swiper :pin "544e7de63a4543a74596c5d95efa0bb9da25791e") (package! ivy) (package! ivy-hydra) (package! counsel) (package! amx :pin "7fb7b874291e0cdeb1f0acb18564a686ec86788d") -(package! counsel-projectile :pin "126e825bbab872b3befd9ef88660571391ebfdc3") -(package! ivy-rich :pin "3f818b201769bc13cc75aa73645217e374136aca") +(package! counsel-projectile :pin "77392cbbc42e98fc137b43f1db1b111ba6e2dd75") +(package! ivy-rich :pin "10970130b41c6ef9570893cdab8dfbe720e2b1a9") (package! wgrep :pin "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f") (if (featurep! +prescient) @@ -17,7 +17,7 @@ (package! flx :pin "17f5c9cb2af18aa6f52910ff4a5a63591261ced5"))) (when (featurep! +childframe) - (package! ivy-posframe :pin "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50")) + (package! ivy-posframe :pin "44749562a9e68bd43ccaa225b31311476fab1251")) (when (featurep! +icons) (package! all-the-icons-ivy :pin "a70cbfa1effe36efc946a823a580cec686d5e88d"))