(normal-splash-screen, fancy-splash-screens-1): Add a reference to the Lisp

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

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 03bc171a657d8ab1a751ec50bd0b2cabaab5a12c..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>
 
@@ -18,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -50,7 +51,7 @@
             (load "ediff-init.el" nil nil 'nosuffix))
         )))
 ;; end pacifier
-      
+
 ;; VC.el support
 
 (defun ediff-vc-latest-version (file)
@@ -72,7 +73,7 @@
   ;; If the current buffer is named `F', the version is named `F.~REV~'.
   ;; If `F.~REV~' already exists, it is used instead of being re-created.
   (let (file1 file2 rev1buf rev2buf)
-    (if (string= rev1 "") 
+    (if (string= rev1 "")
        (setq rev1 (ediff-vc-latest-version (buffer-file-name))))
     (save-window-excursion
       (save-excursion
@@ -93,12 +94,12 @@
      rev1buf rev2buf
      startup-hooks
      'ediff-revision)))
-    
+
 ;; RCS.el support
 (defun rcs-ediff-view-revision (&optional rev)
 ;; View previous RCS revision of current file.
 ;; With prefix argument, prompts for a revision name.
-  (interactive (list (if current-prefix-arg 
+  (interactive (list (if current-prefix-arg
                         (read-string "Revision: "))))
   (let* ((filename (buffer-file-name (current-buffer)))
         (switches (append '("-p")
@@ -116,10 +117,10 @@
          (apply 'call-process "co" nil t nil
                 ;; -q: quiet (no diagnostics)
                 (append switches rcs-default-co-switches
-                        (list "-q" filename))))) 
+                        (list "-q" filename)))))
       (message "")
-      buff)))    
-      
+      buff)))
+
 (defun ediff-rcs-get-output-buffer (file name)
   ;; Get a buffer for RCS output for FILE, make it writable and clean it up.
   ;; Optional NAME is name to use instead of `*RCS-output*'.
@@ -143,7 +144,7 @@
                        (current-buffer)
                      (rcs-ediff-view-revision rev2))
            rev1buf (rcs-ediff-view-revision rev1)))
-       
+
     ;; rcs.el doesn't create temp version files, so we don't have to delete
     ;; anything in startup hooks to ediff-buffers
     (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
@@ -177,7 +178,7 @@
 
 ;;; Merge with Version Control
 
-(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev 
+(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)
@@ -195,9 +196,9 @@
                (setq ancestor-rev (vc-workfile-version buffer-file-name)))
            (vc-version-other-window ancestor-rev)
            (setq ancestor-buf (current-buffer))))
-      (setq startup-hooks 
-           (cons 
-            `(lambda () 
+      (setq startup-hooks
+           (cons
+            `(lambda ()
                (delete-file ,(buffer-file-name buf1))
                (or ,(string= rev2 "")
                    (delete-file ,(buffer-file-name buf2)))
@@ -278,11 +279,11 @@
         (default-directory
           (file-name-as-directory (cvs-fileinfo->dir fileinfo)))
         ancestor-file)
-    
+
     (or (memq type '(MERGED CONFLICT MODIFIED))
        (error
         "Can only merge `Modified', `Merged' or `Conflict' files"))
-    
+
     (cond ((memq type '(MERGED CONFLICT))
           (setq ancestor-file
                 (cvs-retrieve-revision-to-tmpfile
@@ -298,18 +299,24 @@
          ((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))
     (if (stringp ancestor-file) (delete-file ancestor-file))))
 
+
+(provide 'ediff-vers)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; 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)
-
+;;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
 ;;; ediff-vers.el ends here