Mercurial > emacs
changeset 74137:c11c74aedbe5
2006-11-23 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove
condition-case.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Thu, 23 Nov 2006 14:15:42 +0000 |
| parents | 8d82adfb134d |
| children | 2d6f332357b9 |
| files | lisp/ChangeLog lisp/ediff-diff.el |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 23 08:42:06 2006 +0000 +++ b/lisp/ChangeLog Thu Nov 23 14:15:42 2006 +0000 @@ -1,3 +1,8 @@ +2006-11-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove + condition-case. + 2006-11-23 Glenn Morris <rgm@gnu.org> * progmodes/f90.el (f90-comment-indent): Do not move point in
--- a/lisp/ediff-diff.el Thu Nov 23 08:42:06 2006 +0000 +++ b/lisp/ediff-diff.el Thu Nov 23 14:15:42 2006 +0000 @@ -1274,9 +1274,7 @@ ;; Similarly for Windows-* ;; In DOS, must synchronize because DOS doesn't have ;; asynchronous processes. - (condition-case nil - (apply 'call-process program nil buffer nil args) - (error (format "Cannot execute program %S." program))) + (apply 'call-process program nil buffer nil args) ;; On other systems, do it asynchronously. (setq proc (get-buffer-process buffer)) (if proc (kill-process proc)) @@ -1447,14 +1445,12 @@ "Return t if files F1 and F2 have identical contents." (if (and (not (file-directory-p f1)) (not (file-directory-p f2))) - (condition-case nil - (let ((res - (apply 'call-process ediff-cmp-program nil nil nil - (append ediff-cmp-options (list (expand-file-name f1) - (expand-file-name f2)))) - )) - (and (numberp res) (eq res 0))) - (error (format "Cannot execute program %S." ediff-cmp-program))) + (let ((res + (apply 'call-process ediff-cmp-program nil nil nil + (append ediff-cmp-options (list (expand-file-name f1) + (expand-file-name f2)))) + )) + (and (numberp res) (eq res 0))) ))