diff options
| author | Jesper Harder <harder@ifa.au.dk> | 2006-06-06 18:45:21 +0000 |
|---|---|---|
| committer | Jesper Harder <harder@ifa.au.dk> | 2006-06-06 18:45:21 +0000 |
| commit | 79f28143bee6cd16182441e69d9b2ba5a4cdd664 (patch) | |
| tree | 0a5dfafd47850cf0c2d3774771036e7c42302410 /lisp/ediff-diff.el | |
| parent | dd24cb375fc84ea98e672da58b5ba814ef8ba472 (diff) | |
| download | emacs-79f28143bee6cd16182441e69d9b2ba5a4cdd664.tar.gz | |
(ediff-diff-mandatory-option): Protect against
file-error.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 57456367522..7746954292d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -65,8 +65,10 @@ Must produce output compatible with Unix's diff3 program." ;; 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"))) |