Mercurial > emacs
changeset 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 | 3798a822991e |
| children | 7e9a40fac3e9 |
| files | lisp/ChangeLog lisp/ediff-diff.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 06 14:17:31 2006 +0000 +++ b/lisp/ChangeLog Tue Jun 06 18:43:36 2006 +0000 @@ -1,3 +1,8 @@ +2006-06-06 Jesper Harder <harder@phys.au.dk> + + * ediff-diff.el (ediff-diff-mandatory-option): Protect against + file-error. + 2006-06-06 Chong Yidong <cyd@stupidchicken.com> * diff-mode.el (diff-mode): Set buffer-read-only to t when
--- 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")))