summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-12-06 17:18:23 +0200
committerEli Zaretskii <eliz@gnu.org>2013-12-06 17:18:23 +0200
commita59d76e05f20a25ecec8fc83834ba03c343ae4a2 (patch)
tree8089fad95932543ed45faa9346c2c2545839b587 /lisp
parent6d6aa291f262d6dba7a92f411d5f46789c8413a0 (diff)
downloademacs-a59d76e05f20a25ecec8fc83834ba03c343ae4a2.tar.gz
emacs-a59d76e05f20a25ecec8fc83834ba03c343ae4a2.tar.bz2
emacs-a59d76e05f20a25ecec8fc83834ba03c343ae4a2.zip
Revert inadvertently commited changes in grep.el.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/grep.el12
1 files changed, 3 insertions, 9 deletions
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 "))))))