diff options
| author | Eli Zaretskii | 2013-12-06 17:18:23 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-06 17:18:23 +0200 |
| commit | a59d76e05f20a25ecec8fc83834ba03c343ae4a2 (patch) | |
| tree | 8089fad95932543ed45faa9346c2c2545839b587 | |
| parent | 6d6aa291f262d6dba7a92f411d5f46789c8413a0 (diff) | |
| download | emacs-a59d76e05f20a25ecec8fc83834ba03c343ae4a2.tar.gz emacs-a59d76e05f20a25ecec8fc83834ba03c343ae4a2.zip | |
Revert inadvertently commited changes in grep.el.
| -rw-r--r-- | lisp/progmodes/grep.el | 12 |
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." | |||
| 1005 | (mapconcat | 1005 | (mapconcat |
| 1006 | #'shell-quote-argument | 1006 | #'shell-quote-argument |
| 1007 | (split-string files) | 1007 | (split-string files) |
| 1008 | (concat | 1008 | (concat "\\\n" " -o " find-name-arg " ")) |
| 1009 | (if (file-remote-p dir) "\\\n") | ||
| 1010 | " -o " find-name-arg " ")) | ||
| 1011 | " " | 1009 | " " |
| 1012 | (shell-quote-argument ")")) | 1010 | (shell-quote-argument ")")) |
| 1013 | dir | 1011 | dir |
| @@ -1028,9 +1026,7 @@ to specify a command to run." | |||
| 1028 | (concat "*/" | 1026 | (concat "*/" |
| 1029 | (cdr ignore))))))) | 1027 | (cdr ignore))))))) |
| 1030 | grep-find-ignored-directories | 1028 | grep-find-ignored-directories |
| 1031 | (if (file-remote-p dir) | 1029 | "\\\n -o -path ") |
| 1032 | "\\\n -o -path " | ||
| 1033 | " -o -path ")) | ||
| 1034 | " " | 1030 | " " |
| 1035 | (shell-quote-argument ")") | 1031 | (shell-quote-argument ")") |
| 1036 | " -prune -o ")) | 1032 | " -prune -o ")) |
| @@ -1048,9 +1044,7 @@ to specify a command to run." | |||
| 1048 | (shell-quote-argument | 1044 | (shell-quote-argument |
| 1049 | (cdr ignore)))))) | 1045 | (cdr ignore)))))) |
| 1050 | grep-find-ignored-files | 1046 | grep-find-ignored-files |
| 1051 | (if (file-remote-p dir) | 1047 | "\\\n -o -name ") |
| 1052 | "\\\n -o -name " | ||
| 1053 | " -o -name ")) | ||
| 1054 | " " | 1048 | " " |
| 1055 | (shell-quote-argument ")") | 1049 | (shell-quote-argument ")") |
| 1056 | " -prune -o ")))))) | 1050 | " -prune -o ")))))) |