Avoid compiler warning in w32xfns.c.

 src/w32xfns.c: Include window.h, to avoid a compiler warning.

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 46af51e1f97ed2b29c546031a5a5f340dc49e53b..5b0c080de29e849656db4e9111a870f72915c7c4 100644 (file)
--- 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 fc61fbb133057e9546070100f780f65c757cb766..375c6905f734e66128bea97c70e329d77bce9dcb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32xfns.c: Include window.h, to avoid a compiler warning.
+
 2013-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * window.c (window_scroll): Mark window for redisplay (bug#16034).

diff --git a/src/w32xfns.c b/src/w32xfns.c
index 07f754778638e4e1976be5e360ca261658554e6a..b49abffa130d032be76f7683b7a59ecf363a6a3f 100644 (file)
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "keyboard.h"
 #include "frame.h"
+#include "window.h"
 #include "charset.h"
 #include "fontset.h"
 #include "blockinput.h"