[Emacs-diffs] Changes to emacs/lisp/find-dired.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/08/28 08:02:38

Index: find-dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/find-dired.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- find-dired.el       6 Feb 2006 14:33:33 -0000       1.52
+++ find-dired.el       28 Aug 2006 08:02:38 -0000      1.53
@@ -129,8 +129,17 @@
          args (concat find-dired-find-program " . "
                       (if (string= args "")
                           ""
-                        (concat "\\( " args " \\) "))
-                      (car find-ls-option)))
+                        (concat
+                         (shell-quote-argument "(")
+                         " " args " "
+                         (shell-quote-argument ")")
+                         " "))
+                      (if (equal (car find-ls-option) "-exec ls -ld {} \\;")
+                          (concat "-exec ls -ld "
+                                  (shell-quote-argument "{}")
+                                  " "
+                                  (shell-quote-argument ";"))
+                        (car find-ls-option))))
     ;; Start the find process.
     (shell-command (concat args "&") (current-buffer))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
@@ -215,7 +224,10 @@
   (find-dired dir
              (concat "-type f -exec grep " find-grep-options " -e "
                      (shell-quote-argument regexp)
-                     " {} \\\; ")))
+                     " "
+                     (shell-quote-argument "{}")
+                     " "
+                     (shell-quote-argument ";"))))
 
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.