diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:25:18 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:25:18 +0000 |
| commit | d6e01aa592f7326dffeafa6e97180a1cc39fe7ea (patch) | |
| tree | 5a22b785cfee1d77d6452607450a12ca82eeecd3 /lisp/ediff-diff.el | |
| parent | 14bcc1e098410087a837313e2fc822319ff2e8ca (diff) | |
| parent | 4975e69596a64247e8995d1ff9084b98a9a5ed0d (diff) | |
| download | emacs-d6e01aa592f7326dffeafa6e97180a1cc39fe7ea.tar.gz emacs-d6e01aa592f7326dffeafa6e97180a1cc39fe7ea.tar.bz2 emacs-d6e01aa592f7326dffeafa6e97180a1cc39fe7ea.zip | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-479
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-480
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-481
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-482
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-483
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-484
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-485
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-153
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-154
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-155
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index e3675064010..d2dff294d2e 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1450,7 +1450,9 @@ arguments to `skip-chars-forward'." (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))) )) |