diff options
| author | Michael Kifer | 2006-11-23 14:15:42 +0000 |
|---|---|---|
| committer | Michael Kifer | 2006-11-23 14:15:42 +0000 |
| commit | 31e710262bb855f1033690fdcc4524962c156cf8 (patch) | |
| tree | c6cff6a9d8013829cee9609ec71d244b60c5891a /lisp/ediff-diff.el | |
| parent | 48d2bac4519b3434dfb862ed1c9310cad1ddf9dc (diff) | |
| download | emacs-31e710262bb855f1033690fdcc4524962c156cf8.tar.gz emacs-31e710262bb855f1033690fdcc4524962c156cf8.zip | |
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")) | |||
| 1274 | ;; Similarly for Windows-* | 1274 | ;; Similarly for Windows-* |
| 1275 | ;; In DOS, must synchronize because DOS doesn't have | 1275 | ;; In DOS, must synchronize because DOS doesn't have |
| 1276 | ;; asynchronous processes. | 1276 | ;; asynchronous processes. |
| 1277 | (condition-case nil | 1277 | (apply 'call-process program nil buffer nil args) |
| 1278 | (apply 'call-process program nil buffer nil args) | ||
| 1279 | (error (format "Cannot execute program %S." program))) | ||
| 1280 | ;; On other systems, do it asynchronously. | 1278 | ;; On other systems, do it asynchronously. |
| 1281 | (setq proc (get-buffer-process buffer)) | 1279 | (setq proc (get-buffer-process buffer)) |
| 1282 | (if proc (kill-process proc)) | 1280 | (if proc (kill-process proc)) |
| @@ -1447,14 +1445,12 @@ arguments to `skip-chars-forward'." | |||
| 1447 | "Return t if files F1 and F2 have identical contents." | 1445 | "Return t if files F1 and F2 have identical contents." |
| 1448 | (if (and (not (file-directory-p f1)) | 1446 | (if (and (not (file-directory-p f1)) |
| 1449 | (not (file-directory-p f2))) | 1447 | (not (file-directory-p f2))) |
| 1450 | (condition-case nil | 1448 | (let ((res |
| 1451 | (let ((res | 1449 | (apply 'call-process ediff-cmp-program nil nil nil |
| 1452 | (apply 'call-process ediff-cmp-program nil nil nil | 1450 | (append ediff-cmp-options (list (expand-file-name f1) |
| 1453 | (append ediff-cmp-options (list (expand-file-name f1) | 1451 | (expand-file-name f2)))) |
| 1454 | (expand-file-name f2)))) | 1452 | )) |
| 1455 | )) | 1453 | (and (numberp res) (eq res 0))) |
| 1456 | (and (numberp res) (eq res 0))) | ||
| 1457 | (error (format "Cannot execute program %S." ediff-cmp-program))) | ||
| 1458 | )) | 1454 | )) |
| 1459 | 1455 | ||
| 1460 | 1456 | ||