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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/11/27 03:59:04

Index: ediff-merg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- ediff-merg.el       26 Jul 2007 05:26:21 -0000      1.33
+++ ediff-merg.el       27 Nov 2007 03:59:04 -0000      1.34
@@ -37,9 +37,9 @@
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
     (or (featurep 'ediff-init)
-       (load "ediff-init.el" nil nil 'nosuffix))
+       (load "ediff-init.el" nil t 'nosuffix))
     (or (featurep 'ediff-util)
-       (load "ediff-util.el" nil nil 'nosuffix))
+       (load "ediff-util.el" nil t 'nosuffix))
     ))
 ;; end pacifier