emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el,v


From: Michael Kifer
Subject: [Emacs-diffs] Changes to emacs/lisp/ediff-diff.el,v
Date: Thu, 23 Nov 2006 14:15:44 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   06/11/23 14:15:43

Index: ediff-diff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-diff.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- ediff-diff.el       23 Oct 2006 19:20:15 -0000      1.55
+++ ediff-diff.el       23 Nov 2006 14:15:42 -0000      1.56
@@ -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)))
              ;; 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)))
     ))
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]