Initial revision

[gnu-emacs] / lisp / ediff-vers.el

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index cec2d6f2ccf156be55074f63790287b1901f16c6..42ce45c77b2f20154d9994c883c5b7af06f307f5 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,6 +1,6 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;;; Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+;;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 
@@ -30,6 +30,7 @@
 (defvar cvs-shell)
 (defvar cvs-program)
 (defvar cvs-cookie-handle)
+(defvar ediff-temp-file-prefix)
 
 (and noninteractive
      (eval-when-compile
@@ -145,7 +146,8 @@
 
 ;;; Merge with Version Control
 
-(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks)
+(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev 
+                                    &optional startup-hooks merge-buffer-file)
 ;; If ANCESTOR-REV non-nil, merge with ancestor
   (let (buf1 buf2 ancestor-buf)
     (save-excursion
@@ -174,12 +176,14 @@
     (if ancestor-rev
        (ediff-merge-buffers-with-ancestor
         buf1 buf2 ancestor-buf
-        startup-hooks 'ediff-merge-revisions-with-ancestor)
-      (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions))
+        startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
+      (ediff-merge-buffers
+       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
     ))
 
 (defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev
-                                     &optional startup-hooks)
+                                     &optional
+                                     startup-hooks merge-buffer-file)
   ;; If ANCESTOR-REV non-nil, merge with ancestor
   (let (buf1 buf2 ancestor-buf)
     (setq buf1 (rcs-ediff-view-revision rev1)
@@ -195,11 +199,13 @@
     (if ancestor-rev
        (ediff-merge-buffers-with-ancestor
         buf1 buf2 ancestor-buf
-        startup-hooks 'ediff-merge-revisions-with-ancestor)
-      (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions))))
+        startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
+      (ediff-merge-buffers
+       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
 
 (defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev
-                                            &optional startup-hooks)
+                                            &optional
+                                            startup-hooks merge-buffer-file)
   ;; If ANCESTOR-REV non-nil, merge with ancestor
   (let (buf1 buf2 ancestor-buf)
     (save-excursion
@@ -219,8 +225,9 @@
     (if ancestor-rev
        (ediff-merge-buffers-with-ancestor
         buf1 buf2 ancestor-buf
-        startup-hooks 'ediff-merge-revisions-with-ancestor)
-      (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions))))
+        startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
+      (ediff-merge-buffers
+       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
 
 
 ;; PCL-CVS.el support
@@ -253,7 +260,8 @@
 ;; Works like with other interfaces: runs ediff on versions of the file in the
 ;; current buffer.
 (defun ediff-pcl-cvs-merge-internal (rev1 rev2 ancestor-rev
-                                         &optional startup-hooks)
+                                         &optional
+                                         startup-hooks merge-buffer-file)
 ;; Ediff-merge appropriate revisions of the selected file.
 ;; If REV1 is "" then use the latest revision.
 ;; If REV2 is "" then merge current buffer's file with REV1.
@@ -291,9 +299,9 @@
     (if ancestor-buf
        (ediff-merge-buffers-with-ancestor
         buf1 buf2 ancestor-buf startup-hooks 
-        'ediff-merge-revisions-with-ancestor)
+        'ediff-merge-revisions-with-ancestor merge-buffer-file)
       (ediff-merge-buffers
-       buf1 buf2 startup-hooks 'ediff-merge-revisions))
+       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
     ))
 
 (defun ediff-pcl-cvs-view-revision (file rev)
@@ -323,12 +331,14 @@
 
 (defun cvs-run-ediff-on-file-descriptor (tin)
 ;; This is a replacement for cvs-emerge-mode
-;; Run after cvs-update.
+;; Runs after cvs-update.
 ;; Ediff-merge appropriate revisions of the selected file.
   (let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
         (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))
@@ -348,18 +358,18 @@
            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))))
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
+;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;;; End:
 
 (provide 'ediff-vers)