From 0ab67a65f58e767f73a55f28e37b1a80bfc36682 Mon Sep 17 00:00:00 2001
From: Alex Gramiak <agrambot@gmail.com>
Date: Wed, 7 Oct 2020 05:41:23 +0200
Subject: [PATCH] Default the grep commands to skip directories

* lisp/progmodes/grep.el (grep-compute-defaults): Skip directories
(bug#23590).
---
 lisp/progmodes/grep.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 279eb4d54b1..6bc187028fb 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -703,10 +703,15 @@ The value depends on `grep-command', `grep-template',
       (let ((grep-options
 	     (concat (if grep-use-null-device "-n" "-nH")
                      (if grep-use-null-filename-separator " --null")
-		     (if (grep-probe grep-program
-				     `(nil nil nil "-e" "foo" ,null-device)
-				     nil 1)
-			 " -e"))))
+                     (when (grep-probe grep-program
+                                       `(nil nil nil "--directories=skip" "foo"
+                                             ,null-device)
+                                       nil 1)
+                       " --directories=skip")
+                     (when (grep-probe grep-program
+                                       `(nil nil nil "-e" "foo" ,null-device)
+                                       nil 1)
+                       " -e"))))
 	(unless grep-command
 	  (setq grep-command
 		(format "%s %s %s " grep-program
-- 
2.39.5