CVS update by michaels packages/xemacs-packages/igrep ...

xemacs-cvs at xemacs.org xemacs-cvs at xemacs.org
Mon Dec 17 07:18:27 EST 2007


  User: michaels
  Date: 07/12/17 13:18:27

  Modified:    packages/xemacs-packages/igrep ChangeLog igrep.el
Log:
2007-12-17  Mike Sperber  <mike at xemacs.org>

	* igrep.el (igrep-find-use-xargs): Cater to the case where we have
	GNU find, but no xargs -e.  (Mac OS X, for example.)

Revision  Changes    Path
1.25      +5 -0      XEmacs/packages/xemacs-packages/igrep/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/igrep/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ChangeLog	2007/08/22 19:39:54	1.24
+++ ChangeLog	2007/12/17 12:18:27	1.25
@@ -1,3 +1,8 @@
+2007-12-17  Mike Sperber  <mike at xemacs.org>
+
+	* igrep.el (igrep-find-use-xargs): Cater to the case where we have
+	GNU find, but no xargs -e.  (Mac OS X, for example.)
+
 2007-08-22  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.15 released.



1.14      +5 -3      XEmacs/packages/xemacs-packages/igrep/igrep.el

Index: igrep.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/igrep/igrep.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- igrep.el	2007/08/21 15:14:04	1.13
+++ igrep.el	2007/12/17 12:18:27	1.14
@@ -447,11 +447,13 @@ see `igrep-find'.")
 see `igrep-find'.")
 
 (defvar igrep-find-use-xargs
-  (cond ((equal (call-process igrep-find-program nil nil nil
-                              igrep-null-device "-print0")
+  (cond ((not (equal (call-process "xargs" nil nil nil "-e") 0))
+	 nil)
+	((equal (call-process igrep-find-program nil nil nil
+			      igrep-null-device "-print0")
                 0)
 	 'gnu)
-        ((equal (call-process "xargs" nil nil nil "-e") 0)))
+	(t t))
   "Whether `\\[igrep-find]' uses the `xargs` program or not.
 If `gnu', it executes
 	`find ... -print0 | xargs -0 -e grep ...`;





More information about the XEmacs-CVS mailing list