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

[Glenn Morris]

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

Index: ediff-mult.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- ediff-mult.el       10 Apr 2008 14:09:35 -0000      1.60
+++ ediff-mult.el       3 May 2008 20:53:30 -0000       1.61
@@ -115,13 +115,8 @@
 
 ;; compiler pacifier
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  (if (not (featurep 'ediff-ptch))
-      (require 'ediff-ptch))
-  (require 'ediff)
-  )
+  (require 'ediff-ptch)
+  (require 'ediff))
 ;; end pacifier
 
 (require 'ediff-init)