[Emacs-diffs] trunk r115378: Avoid compiler warning in w32xfns.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115378
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 21:05:16 +0200
message:
  Avoid compiler warning in w32xfns.c.
  
   src/w32xfns.c: Include window.h, to avoid a compiler warning.
modified:
  lisp/progmodes/grep.el         grep.el-20091113204419-o5vbwnq5f7feedwu-2948
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32xfns.c                  w32xfns.c-20091113204419-o5vbwnq5f7feedwu-951

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2013-05-24 20:54:38 +0000
+++ b/lisp/progmodes/grep.el    2013-12-04 19:05:16 +0000
@@ -1005,7 +1005,9 @@
                              (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 @@
                                                      (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 @@
                                                     (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 "))))))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-04 18:46:47 +0000
+++ b/src/ChangeLog     2013-12-04 19:05:16 +0000
@@ -1,3 +1,7 @@
+2013-12-04  Eli Zaretskii  <address@hidden>
+
+       * w32xfns.c: Include window.h, to avoid a compiler warning.
+
 2013-12-04  Stefan Monnier  <address@hidden>
 
        * window.c (window_scroll): Mark window for redisplay (bug#16034).

=== modified file 'src/w32xfns.c'
--- a/src/w32xfns.c     2013-09-13 15:03:51 +0000
+++ b/src/w32xfns.c     2013-12-04 19:05:16 +0000
@@ -24,6 +24,7 @@
 #include "lisp.h"
 #include "keyboard.h"
 #include "frame.h"
+#include "window.h"
 #include "charset.h"
 #include "fontset.h"
 #include "blockinput.h"