summaryrefslogtreecommitdiff
path: root/lisp/ediff-ptch.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-ptch.el')
-rw-r--r--lisp/ediff-ptch.el14
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)))