# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1026516276 0
# Node ID 4079bb42ddaec6c4993e2804c0703fb34953f575
# Parent  bdd4f73e1fec7db367acfac296346d9d4be767af
(ediff-test-patch-utility): Catch error and return nil.

diff -r bdd4f73e1fec -r 4079bb42ddae lisp/ediff-ptch.el
--- a/lisp/ediff-ptch.el	Fri Jul 12 23:23:29 2002 +0000
+++ b/lisp/ediff-ptch.el	Fri Jul 12 23:24:36 2002 +0000
@@ -85,12 +85,14 @@
   :group 'ediff-ptch)
 
 (defun ediff-test-patch-utility ()
-  (cond ((zerop (call-process ediff-patch-program nil nil nil "-z." "-b"))
-	 ;; GNU `patch' v. >= 2.2
-	 'gnu)
-	((zerop (call-process ediff-patch-program nil nil nil "-b"))
-	 'posix)
-	(t 'traditional)))
+  (condition-case nil
+      (cond ((zerop (call-process ediff-patch-program nil nil nil "-z." "-b"))
+	     ;; GNU `patch' v. >= 2.2
+	     'gnu)
+	    ((zerop (call-process ediff-patch-program nil nil nil "-b"))
+	     'posix)
+	    (t 'traditional))
+    (file-error nil)))
 
 (defcustom ediff-backup-specs 
   (let ((type (ediff-test-patch-utility)))