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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/05/03 20:53:31

Index: ediff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- ediff.el    16 Apr 2008 14:10:31 -0000      1.100
+++ ediff.el    3 May 2008 20:53:30 -0000       1.101
@@ -115,27 +115,14 @@
 (provide 'ediff)
 
 ;; Compiler pacifier
-(defvar cvs-cookie-handle)
-(defvar ediff-last-dir-patch)
-(defvar ediff-patch-default-directory)
-(defvar ediff-control-window)
-
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
 
 (eval-when-compile
   (require 'dired)
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  (require 'ediff-wind)
-  (if (not (featurep 'ediff-ptch))
+  (require 'ediff-util)
       (require 'ediff-ptch))
-  (require 'ediff-vers)
-  )
 ;; end pacifier
 
 (require 'ediff-init)