From ddf107a507cf5c0bc2e9a52eef600ad61e63f91e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 11 Aug 2018 01:36:26 +0200 Subject: [PATCH] Disable counsel-projectile temporarily #93 Until upstream resolves ericdanan/counsel-projectile#93 --- modules/completion/ivy/autoload/ivy.el | 12 ++++-------- modules/completion/ivy/config.el | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index e556da596..da1c8a4de 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -224,14 +224,10 @@ The point of this is to avoid Emacs locking up indexing massive file trees." #'counsel-find-file) ((doom-project-p 'nocache) - #'projectile-find-file) - - ;; FIXME When counsel-projectile-find-file is fixed upstream - ;; ((doom-project-p 'nocache) - ;; (let ((files (projectile-current-project-files))) - ;; (if (<= (length files) ivy-sort-max-size) - ;; #'counsel-projectile-find-file - ;; #'projectile-find-file))) + (let ((files (projectile-current-project-files))) + (if (<= (length files) ivy-sort-max-size) + #'counsel-projectile-find-file + #'projectile-find-file))) (#'counsel-file-jump)))) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 5b87887ac..62a3d96dc 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -149,6 +149,7 @@ immediately runs it on the current candidate (ending the ivy session)." (def-package! counsel-projectile + :disabled t :commands (counsel-projectile-find-file counsel-projectile-find-dir counsel-projectile-switch-to-buffer counsel-projectile-grep counsel-projectile-ag counsel-projectile-switch-project) :init