2006-11-23 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove
	condition-case.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe5b0fd5c40e2955b0453ffc9e160c32c5067ac6..d52dd690f7d4856dc1c8397959f74d33c61367ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index d2dff294d2ea15e7816860d6988fb37162756545..7786326bea971e78a5b4ef6e4fb35faac1a882ee 100644 (file)
--- 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)))
     ))