(isearch-update-ring): Doc fix.

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

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 70069cc2193e9d5c47d4e65da15d87815a48ebe7..3e8b1c375723a2ba91d91e9aedc502ac20969840 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,6 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;;; Copyright (C) 1995, 96, 97, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -298,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))
@@ -307,6 +311,7 @@
 
 (provide 'ediff-vers)
 
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)