[Top][All Lists]
[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: |
Mon, 23 Oct 2006 19:20:17 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 06/10/23 19:20:15
Index: lisp/ediff-diff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-diff.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- lisp/ediff-diff.el 18 Jun 2006 17:08:24 -0000 1.54
+++ lisp/ediff-diff.el 23 Oct 2006 19:20:15 -0000 1.55
@@ -1450,7 +1450,9 @@
(condition-case nil
(let ((res
(apply 'call-process ediff-cmp-program nil nil nil
- (append ediff-cmp-options (list f1 f2)))))
+ (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)))
))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-diff.el,v,
Michael Kifer <=