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

[Michael Kifer]

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

Index: ediff-vers.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- ediff-vers.el       8 Jan 2008 20:44:59 -0000       1.36
+++ ediff-vers.el       4 Apr 2008 07:51:25 -0000       1.37
@@ -36,13 +36,11 @@
 
 (and noninteractive
      (eval-when-compile
-       (let ((load-path (cons (expand-file-name ".") load-path)))
-        (load "pcl-cvs" 'noerror)
-        (load "rcs" 'noerror)
-        ;; (load "vc" 'noerror) ; this sometimes causes compiler error
-        (or (featurep 'ediff-init)
-            (load "ediff-init.el" nil t 'nosuffix))
-        )))
+       (require 'pcvs nil 'noerror)
+       (require 'rcs nil 'noerror)
+       (require 'vc)
+       (require 'ediff-init)
+       ))
 ;; end pacifier
 
 (defcustom ediff-keep-tmp-versions nil