Mercurial > emacs
changeset 46332:4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 12 Jul 2002 23:24:36 +0000 |
| parents | bdd4f73e1fec |
| children | a86a0859521a |
| files | lisp/ediff-ptch.el |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)))