diff options
author | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-11-23 14:15:42 +0000 |
---|---|---|
committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-11-23 14:15:42 +0000 |
commit | 31e710262bb855f1033690fdcc4524962c156cf8 (patch) | |
tree | c6cff6a9d8013829cee9609ec71d244b60c5891a /lisp/ediff-diff.el | |
parent | 48d2bac4519b3434dfb862ed1c9310cad1ddf9dc (diff) | |
download | emacs-31e710262bb855f1033690fdcc4524962c156cf8.tar.gz |
2006-11-23 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove
condition-case.
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r-- | lisp/ediff-diff.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index d2dff294d2e..7786326bea9 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1274,9 +1274,7 @@ delimiter regions")) ;; 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 @@ arguments to `skip-chars-forward'." "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))) )) |