# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1196135944 0
# Node ID d755c1fce9b3a96f96d5e9a8dc8718020779abd8
# Parent  f110f62d8e3a2021684fa0790133133965ea56ac
Load ediff-*.el files silently.

diff -r f110f62d8e3a -r d755c1fce9b3 lisp/ediff-merg.el
--- a/lisp/ediff-merg.el	Tue Nov 27 03:58:26 2007 +0000
+++ b/lisp/ediff-merg.el	Tue Nov 27 03:59:04 2007 +0000
@@ -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