CVS update by scop packages/xemacs-packages/xemacs-base ...
User: scop
Date: 05/12/31 09:42:58
Modified: packages/xemacs-packages/xemacs-base ChangeLog compile.el
Log:
Don't require xargs <1135704440.29684.18.camel(a)bobcat.mine.nu>
Revision Changes Path
1.174 +5 -0 XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- ChangeLog 2005/10/28 05:14:32 1.173
+++ ChangeLog 2005/12/31 08:42:57 1.174
＠＠ -1,3 +1,8 ＠＠
+2005-12-27 Ville Skyttä <scop(a)xemacs.org>
+
+ * compile.el (grep-find-use-xargs): Don't error out if xargs
+ is not available.
+
2005-10-28 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.00 released.
1.37 +7 -4 XEmacs/packages/xemacs-packages/xemacs-base/compile.el
Index: compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/compile.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- compile.el 2005/10/26 14:16:50 1.36
+++ compile.el 2005/12/31 08:42:58 1.37
＠＠ -547,11 +547,14 ＠＠ Otherwise, it kills it without asking."
(defvar grep-find-use-xargs
;; XEmacs change: test xargs compatibility too, revert to non-print0 xargs
;; if any xargs is available.
- (if (and
- (equal (call-process "find" nil nil nil grep-null-device
"-print0") 0)
- (equal (call-process "xargs" nil nil nil "-0" "-e")
0))
+ (if (condition-case nil
+ (and
+ (equal
+ (call-process "find" nil nil nil grep-null-device "-print0") 0)
+ (equal (call-process "xargs" nil nil nil "-0" "-e")
0))
+ (error nil))
'gnu
- (equal (call-process "xargs") 0))
+ (condition-case nil (equal (call-process "xargs") 0) (error nil)))
"Whether \\[grep-find] uses the `xargs' utility by default.
If nil, it uses `find -exec'; if `gnu', it uses `find -print0' and `xargs
-0';