[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el

[Richard M. Stallman]

Index: emacs/lisp/ediff-ptch.el
diff -c emacs/lisp/ediff-ptch.el:1.17 emacs/lisp/ediff-ptch.el:1.18
*** emacs/lisp/ediff-ptch.el:1.17       Wed Mar 20 01:36:18 2002
--- emacs/lisp/ediff-ptch.el    Fri Jul 12 19:24:36 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)))