From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 15 Mar 2021 01:49:07 +0000 (+0100)
Subject: * lisp/vc/ediff-vers.el: Remove XEmacs compat code.
X-Git-Tag: emacs-28.0.90~3273
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca7cb9830bde49e76c59a2414a87a3f6eb3b0679;p=emacs.git

* lisp/vc/ediff-vers.el: Remove XEmacs compat code.
---

diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 13a653b270b..9e82392725d 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -24,23 +24,9 @@
 
 ;;; Code:
 
-;; Compiler pacifier
-(defvar rcs-default-co-switches)
+(eval-when-compile (require 'ediff-init))
 
-(and noninteractive
-     (eval-when-compile
-       (condition-case nil
-	   ;; for compatibility with current stable version of xemacs
-	   (progn
-	     ;;(require 'pcvs nil 'noerror)
-	     ;;(require 'rcs nil 'noerror)
-	     (require 'pcvs)
-	     (require 'rcs))
-	 (error nil))
-       (require 'vc)
-       (require 'ediff-init)
-       ))
-;; end pacifier
+(defvar rcs-default-co-switches)
 
 (defcustom ediff-keep-tmp-versions nil
   "If t, do not delete temporary previous versions for the files on which