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

[Glenn Morris]

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

Index: ediff-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- ediff-util.el       6 Apr 2008 19:26:02 -0000       1.89
+++ ediff-util.el       3 May 2008 20:53:30 -0000       1.90
@@ -30,8 +30,6 @@
 (provide 'ediff-util)
 
 ;; Compiler pacifier
-(defvar ediff-patch-diagnostics)
-(defvar ediff-patchbufer)
 (defvar ediff-use-toolbar-p)
 (defvar ediff-toolbar-height)
 (defvar ediff-toolbar)
@@ -47,20 +45,8 @@
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
 (eval-when-compile
-  (require 'ediff-init)
-  (require 'ediff-help)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (require 'ediff-mult)
-  (require 'ediff-wind)
-  (if (not (featurep 'ediff-diff))
-      (require 'ediff-diff))
-  (require 'ediff-merg)
-  (require 'ediff)
-  ;; for compatibility with current stable version of xemacs
-  (if (featurep 'xemacs)
-      (require 'ediff-tbar))
-  )
+  (require 'ediff))
+
 ;; end pacifier
 
 
@@ -70,7 +56,6 @@
 (require 'ediff-wind)
 (require 'ediff-diff)
 (require 'ediff-merg)
-
 ;; for compatibility with current stable version of xemacs
 (if (featurep 'xemacs)
     (require 'ediff-tbar))