Mercurial > emacs
diff lisp/ediff-diff.el @ 71250:ffd47c04282f
(ediff-diff-mandatory-option): Protect against
file-error.
| author | Jesper Harder <harder@ifa.au.dk> |
|---|---|
| date | Tue, 06 Jun 2006 18:43:36 +0000 |
| parents | 86df1935a171 |
| children | 4033086b16b6 a8190f7e546e |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Tue Jun 06 14:17:31 2006 +0000 +++ b/lisp/ediff-diff.el Tue Jun 06 18:43:36 2006 +0000 @@ -65,8 +65,10 @@ ;; The following functions needed for setting diff/diff3 options ;; test if diff supports the --binary option (defsubst ediff-test-utility (diff-util option &optional files) - (eq 0 (apply 'call-process - (append (list diff-util nil nil nil option) files)))) + (condition-case () + (eq 0 (apply 'call-process + (append (list diff-util nil nil nil option) files))) + (file-error nil))) (defun ediff-diff-mandatory-option (diff-util) (let ((file (if (boundp 'null-device) null-device "/dev/null")))
