diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
| commit | c004db972f6954c6aaf9690045b1d2fdf8396472 (patch) | |
| tree | c0d07d8e1a33e6888c74ed2189b359e61455fabe /lisp/ediff-vers.el | |
| parent | a16f6b1688d52126befff3d12838b8e0d41ed19c (diff) | |
| download | emacs-c004db972f6954c6aaf9690045b1d2fdf8396472.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 1d5f5fcd008..db555e11b19 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -337,6 +337,8 @@ (type (cvs-fileinfo->type fileinfo)) (tmp-file (cvs-retrieve-revision-to-tmpfile fileinfo)) + (default-directory + (file-name-as-directory (cvs-fileinfo->dir fileinfo))) ancestor-file) (or (memq type '(MERGED CONFLICT MODIFIED)) @@ -356,11 +358,11 @@ nil ; startup-hooks 'ediff-merge-revisions-with-ancestor)) ((eq type 'MODIFIED) - (ediff-merge-buffers + (ediff-buffers (find-file-noselect tmp-file) (find-file-noselect (cvs-fileinfo->full-path fileinfo)) nil ; startup-hooks - 'ediff-merge-revisions))) + 'ediff-revisions))) (if (stringp tmp-file) (delete-file tmp-file)) (if (stringp ancestor-file) (delete-file ancestor-file)))) |