changeset 39358:d599e4f7047f

w32 find cannot be used with `grep-find'.
author Sam Steingold <sds@gnu.org>
date Wed, 19 Sep 2001 20:59:24 +0000
parents 9012f11877c1
children 8d23ea77b66e
files lisp/ChangeLog lisp/progmodes/compile.el
diffstat 2 files changed, 26 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Sep 19 20:21:02 2001 +0000
+++ b/lisp/ChangeLog	Wed Sep 19 20:59:24 2001 +0000
@@ -1,3 +1,9 @@
+2001-09-19  Sam Steingold  <sds@gnu.org>
+
+	w32 find cannot be used with `grep-find'.
+	* progmodes/compile.el (find-program): New variable.
+	(grep-compute-defaults): Use it to set `grep-find-command'.
+
 2001-09-19  Gerd Moellmann  <gerd@gnu.org>
 
 	* ps-bdf.el (bdf-read-bitmap): Initialize returned values to
@@ -85,10 +91,10 @@
 	* simple.el: Comment out change of 2001-09-13.
 
 2001-09-13  Michael Kifer  <kifer@cs.sunysb.edu>
-	
+
 	* viper-cmd.el (viper-replace-char-subr, viper-envelop-ESC-key):
 	inhibit quit.
-	
+
 2001-09-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* files.el (make-auto-save-file-name): If long file names are not
@@ -97,7 +103,7 @@
 
 2001-09-13  Gerd Moellmann  <gerd@gnu.org>
 
-	* ps-print.el (ps-print-region, ps-print-region-with-faces) 
+	* ps-print.el (ps-print-region, ps-print-region-with-faces)
 	(ps-nb-pages-region): Signal an error if called interactively
 	and the mark is not active.
 
@@ -156,18 +162,18 @@
 	* mail/sendmail.el (mail-send): Obey mail-send-nonascii when
 	enable-multibyte-characters = nil.  From Hallvard B Furuseth
 	<h.b.furuseth@usit.uio.no>.
-	
+
 2001-09-09  Michael Kifer  <kifer@cs.sunysb.edu>
-	
+
 	* ediff-init.el (ediff-highest-priority): bug fix.
 
 	* viper-cmd.el (viper-special-read-and-insert-char): new function
 	that reads a character and uses the current input method or
 	iso-accents when appropriate.
-	
+
 	* viper.el and all others: corrections to the comment blocks at
 	the top.
-	
+
 2001-09-09  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* info.el (Info-goto-node): Doc fix.
@@ -186,7 +192,7 @@
 	the entries, to keep the line length balanced for loaddefs.el.
 
 2001-09-07  Dr Francis J. Wright  <F.J.Wright@qmw.ac.uk>
-	
+
 	* comint.el (comint-send-input): Handle comint-process-echoes
 	differently.
 
@@ -201,7 +207,7 @@
 	computation.
 
 2001-09-07  Gerd Moellmann  <gerd@gnu.org>
-	
+
 	* server.el (server-switch-buffer): Use get-window-with-predicate.
 
 	* textmodes/refer.el (refer-find-entry-internal): Use
@@ -255,7 +261,7 @@
 
 	* comint.el (comint-send-input): Change help-echo.
 	From "Dr Francis J. Wright" <F.J.Wright@qmw.ac.uk>.
-	
+
 	* bookmark.el (bookmark-write-file): Bind print-length and
 	print-level to nil.  From Tom Capey <tomc@edina.co.uk>.
 
--- a/lisp/progmodes/compile.el	Wed Sep 19 20:21:02 2001 +0000
+++ b/lisp/progmodes/compile.el	Wed Sep 19 20:59:24 2001 +0000
@@ -437,6 +437,10 @@
   "The default grep program for `grep-command' and `grep-find-command'.
 This variable's value takes effect when `grep-compute-defaults' is called.")
 
+(defvar find-program "find"
+  "The default find program for `grep-find-command'.
+This variable's value takes effect when `grep-compute-defaults' is called.")
+
 (defvar grep-find-use-xargs nil
   "Whether \\[grep-find] uses the `xargs' utility by default.
 
@@ -592,12 +596,13 @@
   (unless grep-find-command
     (setq grep-find-command
 	  (cond ((eq grep-find-use-xargs 'gnu)
-		 (format "find . -type f -print0 | xargs -0 -e %s"
-			 grep-command))
+		 (format "%s . -type f -print0 | xargs -0 -e %s"
+			 find-program grep-command))
 		(grep-find-use-xargs
-		 (format "find . -type f -print | xargs %s" grep-command))
-		(t (cons (format "find . -type f -exec %s {} %s \\;"
-				 grep-command null-device)
+		 (format "%s . -type f -print | xargs %s"
+                         find-program grep-command))
+		(t (cons (format "%s . -type f -exec %s {} %s \\;"
+				 find-program grep-command null-device)
 			 (+ 22 (length grep-command))))))))
 
 ;;;###autoload