Load ediff-*.el files silently.

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index d9d19f176304ee5592b22276cd7740fba67bd096..95f3efca93b2b3104576a4b00cade74c393fad7f 100644 (file)
--- 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 51502615cf77417f8946cf643a02485ec3e3547a..97c05e3b3cb1e8fdeab577197fe2a1aec2ddebb5 100644 (file)
--- 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 2efa2ac3012f05dbc5c12ea07bf9b560a136c3fc..905a07c53dfa69af4bb31eeed924c0f07d30ffb8 100644 (file)
--- 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