*** empty log message ***

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

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 9ae720e9bc3ace5d4e8ca5de836398c372ff8148..4c9dc4dd9c88ca5a2897ead84b45612577461e57 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,7 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -299,7 +299,10 @@
          ((eq type 'MODIFIED)
           (ediff-buffers
            (find-file-noselect tmp-file)
-           (find-file-noselect (cvs-fileinfo->full-path fileinfo))
+           (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))