[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: M-x ediff-files doesn't notify user of missing ediff-diff-program
From: |
Chong Yidong |
Subject: |
Re: M-x ediff-files doesn't notify user of missing ediff-diff-program |
Date: |
Wed, 25 Oct 2006 10:47:48 -0400 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
Nick Roberts <address@hidden> writes:
> Andrew M. Scott writes:
> > Neither
> >
> > M-x ediff-buffers buf1 buf2
> > nor
> > M-x ediff-files file1 file2
> >
> > complain if there isn't an ediff-diff-command on exec-path. Instead,
> > a user can type consecutive "n"'s in the *Ediff Control Panel* without
> > seeing any highlighted diffs (which erroneously leads the user to
> > think there are no diffs).
>
> It worked in Emacs 21.3. This seems to be a regression in ediff-exec-process
> (ediff-diff.el) :
The following patch should fix it. Any objections?
*** emacs/lisp/ediff-diff.el.~1.55.~ 2006-10-25 10:42:24.000000000 -0400
--- emacs/lisp/ediff-diff.el 2006-10-25 10:46:24.000000000 -0400
***************
*** 1276,1282 ****
;; 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))
--- 1276,1282 ----
;; asynchronous processes.
(condition-case nil
(apply 'call-process program nil buffer nil args)
! (error (error "Cannot execute program %S." program)))
;; On other systems, do it asynchronously.
(setq proc (get-buffer-process buffer))
(if proc (kill-process proc))