merge emacs-23

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index dac14d07ef8..dd6dc025d5b 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -561,7 +561,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
         (unless grep-find-command
           (setq grep-find-command
                 (cond ((eq grep-find-use-xargs 'gnu)
-                       (format "%s . -type f -print0 | %s -0 -e %s"
+                       ;; Windows shells need the program file name
+                       ;; after the pipe symbol be quoted if they use
+                       ;; forward slashes as directory separators.
+                       (format "%s . -type f -print0 | \"%s\" -0 -e %s"
                                find-program xargs-program grep-command))
                       ((eq grep-find-use-xargs 'exec)
                        (let ((cmd0 (format "%s . -type f -exec %s"
@@ -572,21 +575,21 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
                                   (shell-quote-argument ";"))
                           (1+ (length cmd0)))))
                       (t
-                       (format "%s . -type f -print | %s %s"
+                       (format "%s . -type f -print | \"%s\" %s"
                                find-program xargs-program grep-command)))))
         (unless grep-find-template
           (setq grep-find-template
                 (let ((gcmd (format "%s <C> %s <R>"
                                     grep-program grep-options)))
                   (cond ((eq grep-find-use-xargs 'gnu)
-                         (format "%s . <X> -type f <F> -print0 | %s -0 -e %s"
+                         (format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s"
                                  find-program xargs-program gcmd))
                         ((eq grep-find-use-xargs 'exec)
                          (format "%s . <X> -type f <F> -exec %s {} %s %s"
                                  find-program gcmd null-device
                                  (shell-quote-argument ";")))
                         (t
-                         (format "%s . <X> -type f <F> -print | %s %s"
+                         (format "%s . <X> -type f <F> -print | \"%s\" %s"
                                  find-program xargs-program gcmd))))))))
     (when (eq grep-highlight-matches 'auto-detect)
       (setq grep-highlight-matches