mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove
	condition-case.
This commit is contained in:
Michael Kifer 2006-11-23 14:15:42 +00:00
parent 48d2bac451
commit 31e710262b
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

18
lisp/ediff-diff.el
View file

@ -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)))
))