Commit 79f28143 authored by Jesper Harder's avatar Jesper Harder
Browse files

(ediff-diff-mandatory-option): Protect against

file-error.
parent dd24cb37
2006-06-06 Jesper Harder <harder@phys.au.dk>
* ediff-diff.el (ediff-test-utility): Protect against
file-error.
2006-06-06 Chong Yidong <cyd@stupidchicken.com>
 
* diff-mode.el (diff-mode): Set buffer-read-only to t when
......
......@@ -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")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment