diff options
| author | Richard M. Stallman <rms@gnu.org> | 2002-07-12 23:24:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2002-07-12 23:24:36 +0000 |
| commit | d29a70fedf23be94461b27c0d238e3598772594b (patch) | |
| tree | 41432610427472d16a145193f4d242e605a5f644 /lisp/ediff-ptch.el | |
| parent | 3f334882a443a4a9ec94b74040801ac7a206892f (diff) | |
| download | emacs-d29a70fedf23be94461b27c0d238e3598772594b.tar.gz | |
(ediff-test-patch-utility): Catch error and return nil.
Diffstat (limited to 'lisp/ediff-ptch.el')
| -rw-r--r-- | lisp/ediff-ptch.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 0b6bc49e290..29174ff8e97 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -85,12 +85,14 @@ See also `ediff-backup-specs'." :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))) |