Commit 913250cf authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Avoid compiler warning in w32xfns.c.

 src/w32xfns.c: Include window.h, to avoid a compiler warning.
parent 5961ad6c
...@@ -1005,7 +1005,9 @@ to specify a command to run." ...@@ -1005,7 +1005,9 @@ to specify a command to run."
(mapconcat (mapconcat
#'shell-quote-argument #'shell-quote-argument
(split-string files) (split-string files)
(concat "\\\n" " -o " find-name-arg " ")) (concat
(if (file-remote-p dir) "\\\n")
" -o " find-name-arg " "))
" " " "
(shell-quote-argument ")")) (shell-quote-argument ")"))
dir dir
...@@ -1026,7 +1028,9 @@ to specify a command to run." ...@@ -1026,7 +1028,9 @@ to specify a command to run."
(concat "*/" (concat "*/"
(cdr ignore))))))) (cdr ignore)))))))
grep-find-ignored-directories grep-find-ignored-directories
"\\\n -o -path ") (if (file-remote-p dir)
"\\\n -o -path "
" -o -path "))
" " " "
(shell-quote-argument ")") (shell-quote-argument ")")
" -prune -o ")) " -prune -o "))
...@@ -1044,7 +1048,9 @@ to specify a command to run." ...@@ -1044,7 +1048,9 @@ to specify a command to run."
(shell-quote-argument (shell-quote-argument
(cdr ignore)))))) (cdr ignore))))))
grep-find-ignored-files grep-find-ignored-files
"\\\n -o -name ") (if (file-remote-p dir)
"\\\n -o -name "
" -o -name "))
" " " "
(shell-quote-argument ")") (shell-quote-argument ")")
" -prune -o ")))))) " -prune -o "))))))
......
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> 2013-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
* window.c (window_scroll): Mark window for redisplay (bug#16034). * window.c (window_scroll): Mark window for redisplay (bug#16034).
......
...@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "lisp.h" #include "lisp.h"
#include "keyboard.h" #include "keyboard.h"
#include "frame.h" #include "frame.h"
#include "window.h"
#include "charset.h" #include "charset.h"
#include "fontset.h" #include "fontset.h"
#include "blockinput.h" #include "blockinput.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment