summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/init-grep.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/init-grep.el b/lisp/init-grep.el
index 2c17ac4..344e90a 100644
--- a/lisp/init-grep.el
+++ b/lisp/init-grep.el
@@ -29,13 +29,15 @@ current project."
default-directory))
(use-rg (executable-find "rg"))
(use-git (and git-repository (executable-find "git")))
- (grep-template (cond (use-rg mpolden/rg-template)
- (use-git mpolden/git-grep-template))))
- (grep-apply-setting 'grep-template grep-template)
+ (template (cond (use-rg mpolden/rg-template)
+ (use-git mpolden/git-grep-template))))
+ (grep-apply-setting 'grep-template template)
;; never use null device as all programs support -H
(grep-apply-setting 'grep-use-null-device nil)
(if (or use-rg use-git)
- (lgrep (grep-read-regexp) "" dir)
+ ;; never pass --directories
+ (let ((grep-use-directories-skip nil))
+ (lgrep (grep-read-regexp) "" dir))
(rgrep (grep-read-regexp) "*" dir))))
(defun mpolden/grep-visit-buffer-other-window (&optional result noselect)