From 68eb41faa338a40b037fedaf79f5f4854dfb89d7 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 7 Apr 2020 22:31:44 +0100 Subject: [PATCH] Change projectile dirconfig file to .project (#2829) * Change projectile dirconfig file to .project So it matches the doom project marker `.project`. Otherwise you need to create both a `.project` and then a `.projectile` with the project configuration. To maintain backwards compatibility, it will prefer a `.projectile` file for dirconfig if found. --- core/core-projects.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/core-projects.el b/core/core-projects.el index 05c6a0ba7..5faee70cc 100644 --- a/core/core-projects.el +++ b/core/core-projects.el @@ -75,6 +75,14 @@ Emacs.") (push (abbreviate-file-name doom-local-dir) projectile-globally-ignored-directories) + ;; Override projectile's dirconfig file '.projectile' with doom's project marker '.project'. + (defadvice! doom--projectile-dirconfig-file-a () + :override #'projectile-dirconfig-file + (cond + ;; Prefers '.projectile' to maintain compatibility with existing projects. + ((file-exists-p! (or ".projectile" ".project") (projectile-project-root))) + ((expand-file-name ".project" (projectile-project-root))))) + ;; Disable commands that won't work, as is, and that Doom already provides a ;; better alternative for. (put 'projectile-ag 'disabled "Use +{ivy,helm}/project-search instead")