[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el

[Michael Kifer]

Index: emacs/lisp/ediff-vers.el
diff -c emacs/lisp/ediff-vers.el:1.22 emacs/lisp/ediff-vers.el:1.23
*** emacs/lisp/ediff-vers.el:1.22       Sat Aug  6 22:13:42 2005
--- emacs/lisp/ediff-vers.el    Tue Sep 20 17:47:28 2005
***************
*** 299,305 ****
          ((eq type 'MODIFIED)
           (ediff-buffers
            (find-file-noselect tmp-file)
!           (find-file-noselect (cvs-fileinfo->full-path fileinfo))
            nil ; startup-hooks
            'ediff-revisions)))
      (if (stringp tmp-file) (delete-file tmp-file))
--- 299,308 ----
          ((eq type 'MODIFIED)
           (ediff-buffers
            (find-file-noselect tmp-file)
!           (if (featurep 'xemacs)
!               ;; XEmacs doesn't seem to have cvs-fileinfo->full-name
!               (find-file-noselect (cvs-fileinfo->full-path fileinfo))
!             (find-file-noselect (cvs-fileinfo->full-name fileinfo)))
            nil ; startup-hooks
            'ediff-revisions)))
      (if (stringp tmp-file) (delete-file tmp-file))