[Emacs-diffs] trunk r115400: Revert inadvertently commited changes in grep.el.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115400
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-06 17:18:23 +0200
message:
  Revert inadvertently commited changes in grep.el.
modified:
  lisp/progmodes/grep.el         grep.el-20091113204419-o5vbwnq5f7feedwu-2948

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2013-12-04 19:05:16 +0000
+++ b/lisp/progmodes/grep.el    2013-12-06 15:18:23 +0000
@@ -1005,9 +1005,7 @@
                              (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 @@
                                                      (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 @@
                                                     (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 "))))))