From 913250cf96d9aacdd364ea1d20c11b75c5b64a39 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 4 Dec 2013 21:05:16 +0200 Subject: [PATCH] Avoid compiler warning in w32xfns.c. src/w32xfns.c: Include window.h, to avoid a compiler warning. --- lisp/progmodes/grep.el | 12 +++++++++--- src/ChangeLog | 4 ++++ src/w32xfns.c | 1 + 3 files changed, 14 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 ")))))) diff --git a/src/ChangeLog b/src/ChangeLog index fc61fbb1330..375c6905f73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-12-04 Eli Zaretskii + + * w32xfns.c: Include window.h, to avoid a compiler warning. + 2013-12-04 Stefan Monnier * window.c (window_scroll): Mark window for redisplay (bug#16034). diff --git a/src/w32xfns.c b/src/w32xfns.c index 07f75477863..b49abffa130 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -24,6 +24,7 @@ along with GNU Emacs. If not, see . */ #include "lisp.h" #include "keyboard.h" #include "frame.h" +#include "window.h" #include "charset.h" #include "fontset.h" #include "blockinput.h" -- 2.39.2