Commits

Anonymous committed 90b6658

2003-09-24 Mike Sperber <mike@xemacs.org>

* igrep.el (igrep-find-use-xargs): Don't assume xargs behaves
GNU-like if find does.
* igrep.el (igrep-find-prune-clause): Prune .svn directories.

Comments (0)

Files changed (2)

+2003-09-24  Mike Sperber  <mike@xemacs.org>
+
+	* igrep.el (igrep-find-use-xargs): Don't assume xargs behaves
+	GNU-like if find does.
+	* igrep.el (igrep-find-prune-clause): Prune .svn directories.
+
 2003-03-30  Steve Youngs  <youngs@xemacs.org>
 
 	* Makefile (EARLY_GENERATED_LISP): Revert previous change.
   (if (equal (call-process igrep-find-program nil nil nil
 			   igrep-null-device "-prune")
 	     0)
-      (format "-type d %s -name RCS -o -name CVS -o -name SCCS %s"
+      (format "-type d %s -name RCS -o -name CVS -o -name .svn -o -name SCCS %s"
 	      (shell-quote-argument "(")
 	      (shell-quote-argument ")")))
   "The `find` clause used to prune directories, or nil;
 see `igrep-find'.")
 
 (defvar igrep-find-use-xargs
-  (if (equal (call-process igrep-find-program nil nil nil
-			   igrep-null-device "-print0")
-	     0)
-      'gnu)
+  (if (and (equal (call-process igrep-find-program nil nil nil
+				igrep-null-device "-print0")
+		  0)
+	   (equal (call-process "xargs" nil nil nil
+				"-e" "-0" "cat")
+		  0))
+      'gnu
+    nil)
   "If `gnu', `\\[igrep-find]' executes
 	`find ... -print0 | xargs -0 -e grep ...`;
 if not `gnu' but non-nil, `\\[igrep-find]' executes