grep: Consider current project before Git repository

1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/init-grep.el b/lisp/init-grep.el
index 4e5044f..871fbf3 100644
--- a/lisp/init-grep.el
+++ b/lisp/init-grep.el
@@ -14,10 +14,11 @@ This is only used when running grep in a Git repository.")
 This tries to use either rg or git grep if available, and
 otherwise falls back to regular grep."
   (interactive)
-  (let* ((git-root-dir (locate-dominating-file default-directory ".git"))
-         (dir (or git-root-dir default-directory))
+  (let* ((project-dir (or (cdr (project-current))
+                          (locate-dominating-file default-directory ".git")))
+         (dir (or project-dir default-directory))
          (use-rg (executable-find "rg"))
-         (use-git (and git-root-dir (executable-find "git")))
+         (use-git (and project-dir (executable-find "git")))
          (grep-template (cond (use-rg mpolden/rg-template)
                               (use-git mpolden/git-grep-template))))
     (grep-apply-setting 'grep-template grep-template)