From: Glenn Morris <rgm@gnu.org>
Date: Tue, 27 Nov 2007 03:59:56 +0000 (+0000)
Subject: Load ediff-*.el files silently.
X-Git-Tag: emacs-pretest-23.0.90~9453
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b193954fc622b00a45dd1848c1ba50b3d96bbf2;p=emacs.git

Load ediff-*.el files silently.
---

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index d9d19f17630..95f3efca93b 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -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
 
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 51502615cf7..97c05e3b3cb 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -115,9 +115,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
 
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 2efa2ac3012..905a07c53df 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -43,11 +43,11 @@
 (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-mult)
-	(load "ediff-mult.el" nil nil 'nosuffix))
+	(load "ediff-mult.el" nil t 'nosuffix))
     (or (featurep 'ediff)
-	(load "ediff.el" nil nil 'nosuffix))
+	(load "ediff.el" nil t 'nosuffix))
     ))
 ;; end pacifier