From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.bugs
Subject: Re: (minor) Configure should(?) check for 'patch'..
Date: Fri, 5 Jul 2002 04:48:06 -0600 (MDT)
Sender: bug-gnu-emacs-admin@gnu.org
Message-ID: <200207051048.g65Am6h07527@aztec.santafe.edu>
References: <ap33cv0t5vv.fsf@poynting.umd.edu>
Reply-To: rms@gnu.org
NNTP-Posting-Host: localhost.gmane.org
X-Trace: main.gmane.org 1025866252 32599 127.0.0.1 (5 Jul 2002 10:50:52 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Fri, 5 Jul 2002 10:50:52 +0000 (UTC)
Cc: bug-gnu-emacs@gnu.org, deego@glue.umd.edu
Return-path: <bug-gnu-emacs-admin@gnu.org>
Original-Received: from fencepost.gnu.org ([199.232.76.164])
	by main.gmane.org with esmtp (Exim 3.33 #1 (Debian))
	id 17QQfs-0008Tf-00
	for <gnu-bug-gnu-emacs@m.gmane.org>; Fri, 05 Jul 2002 12:50:52 +0200
Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
	by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian))
	id 17QQgR-0000ty-00; Fri, 05 Jul 2002 06:51:27 -0400
Original-Received: from pele.santafe.edu ([192.12.12.119])
	by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian))
	id 17QQdH-0000fS-00; Fri, 05 Jul 2002 06:48:11 -0400
Original-Received: from aztec.santafe.edu (aztec [192.12.12.49])
	by pele.santafe.edu (8.11.6+Sun/8.11.6) with ESMTP id g65AmAV24291;
	Fri, 5 Jul 2002 04:48:10 -0600 (MDT)
Original-Received: (from rms@localhost)
	by aztec.santafe.edu (8.10.2+Sun/8.9.3) id g65Am6h07527;
	Fri, 5 Jul 2002 04:48:06 -0600 (MDT)
X-Authentication-Warning: aztec.santafe.edu: rms set sender to rms@aztec using -f
Original-To: deego@glue.umd.edu
In-Reply-To: <ap33cv0t5vv.fsf@poynting.umd.edu> (deego@glue.umd.edu)
Errors-To: bug-gnu-emacs-admin@gnu.org
X-BeenThere: bug-gnu-emacs@gnu.org
X-Mailman-Version: 2.0.11
Precedence: bulk
List-Help: <mailto:bug-gnu-emacs-request@gnu.org?subject=help>
List-Post: <mailto:bug-gnu-emacs@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/bug-gnu-emacs>,
	<mailto:bug-gnu-emacs-request@gnu.org?subject=subscribe>
List-Id: Bug reports for GNU Emacs,
	the Swiss army knife of text editors <bug-gnu-emacs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/bug-gnu-emacs>,
	<mailto:bug-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/bug-gnu-emacs/>
Xref: main.gmane.org gmane.emacs.bugs:2469
X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:2469

Does this fix it?

*** ediff-ptch.el.~1.17.~	Thu Mar 21 04:09:01 2002
--- ediff-ptch.el	Fri Jul  5 03:33:51 2002
***************
*** 85,96 ****
    :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)))
  
  (defcustom ediff-backup-specs 
    (let ((type (ediff-test-patch-utility)))
--- 85,98 ----
    :group 'ediff-ptch)
  
  (defun ediff-test-patch-utility ()
!   (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)))