From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 6 Dec 2013 15:18:23 +0000 (+0200)
Subject: Revert inadvertently commited changes in grep.el.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~535
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a59d76e05f20a25ecec8fc83834ba03c343ae4a2;p=emacs.git

Revert inadvertently commited changes in grep.el.
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 5b0c080de29..46af51e1f97 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1005,9 +1005,7 @@ to specify a command to run."
 			      (mapconcat
 			       #'shell-quote-argument
 			       (split-string files)
-			       (concat
-				(if (file-remote-p dir) "\\\n")
-				" -o " find-name-arg " "))
+			       (concat "\\\n" " -o " find-name-arg " "))
 			      " "
 			      (shell-quote-argument ")"))
 		      dir
@@ -1028,9 +1026,7 @@ to specify a command to run."
 						      (concat "*/"
 							      (cdr ignore)))))))
 				     grep-find-ignored-directories
-				     (if (file-remote-p dir)
-					 "\\\n -o -path "
-				       " -o -path "))
+				     "\\\n -o -path ")
 				    " "
 				    (shell-quote-argument ")")
 				    " -prune -o "))
@@ -1048,9 +1044,7 @@ to specify a command to run."
 						     (shell-quote-argument
 						      (cdr ignore))))))
 				     grep-find-ignored-files
-				     (if (file-remote-p dir)
-					 "\\\n -o -name "
-				       " -o -name "))
+				     "\\\n -o -name ")
 				    " "
 				    (shell-quote-argument ")")
 				    " -prune -o "))))))