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

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   08/04/04 07:51:30

Index: ediff-merg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- ediff-merg.el       8 Jan 2008 20:44:36 -0000       1.35
+++ ediff-merg.el       4 Apr 2008 07:51:26 -0000       1.36
@@ -35,12 +35,9 @@
 (defvar ediff-window-config-saved)
 
 (eval-when-compile
-  (let ((load-path (cons (expand-file-name ".") load-path)))
-    (or (featurep 'ediff-init)
-       (load "ediff-init.el" nil t 'nosuffix))
-    (or (featurep 'ediff-util)
-       (load "ediff-util.el" nil t 'nosuffix))
-    ))
+  (require 'ediff-init)
+  (require 'ediff-util)
+  )
 ;; end pacifier
 
 (require 'ediff-init)