diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-04 21:05:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-04 21:05:16 +0200 |
| commit | 913250cf96d9aacdd364ea1d20c11b75c5b64a39 (patch) | |
| tree | c9537655b633d5be6b326e933f21dd1a9160f9e6 /lisp | |
| parent | 5961ad6cd28bd92d171949a03f362f069da82dec (diff) | |
| download | emacs-913250cf96d9aacdd364ea1d20c11b75c5b64a39.tar.gz | |
Avoid compiler warning in w32xfns.c.
src/w32xfns.c: Include window.h, to avoid a compiler warning.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/grep.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 46af51e1f97..5b0c080de29 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -1005,7 +1005,9 @@ to specify a command to run." (mapconcat #'shell-quote-argument (split-string files) - (concat "\\\n" " -o " find-name-arg " ")) + (concat + (if (file-remote-p dir) "\\\n") + " -o " find-name-arg " ")) " " (shell-quote-argument ")")) dir @@ -1026,7 +1028,9 @@ to specify a command to run." (concat "*/" (cdr ignore))))))) grep-find-ignored-directories - "\\\n -o -path ") + (if (file-remote-p dir) + "\\\n -o -path " + " -o -path ")) " " (shell-quote-argument ")") " -prune -o ")) @@ -1044,7 +1048,9 @@ to specify a command to run." (shell-quote-argument (cdr ignore)))))) grep-find-ignored-files - "\\\n -o -name ") + (if (file-remote-p dir) + "\\\n -o -name " + " -o -name ")) " " (shell-quote-argument ")") " -prune -o ")))))) |