Only skip directories in lgrep, not the other grep commands

* lisp/progmodes/grep.el (lgrep): Do the directory ignores here
(bug#23590).
(grep-compute-defaults): ... instead of here, because this would
affect all grep commands, not just lgrep.

1 files changed, 5 insertions, 5 deletions

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 6bc187028fb..f028a4279d1 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -704,11 +704,6 @@ The value depends on `grep-command', `grep-template',
 	     (concat (if grep-use-null-device "-n" "-nH")
                      (if grep-use-null-filename-separator " --null")
                      (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"))))
@@ -1126,6 +1121,11 @@ command before it's run."
 				     grep-find-ignored-files
 				     " --exclude=")))))
 	(when command
+          (when (grep-probe grep-program
+                            `(nil nil nil "--directories=skip" "foo"
+                                  ,null-device)
+                            nil 1)
+            (setq command (concat command " --directories=skip")))
 	  (if confirm
 	      (setq command
 		    (read-from-minibuffer "Confirm: "