# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1196136138 0
# Node ID ab1a84d6206822836a4dbb265725f539c6e25469
# Parent  0230fa103dd6cf7a06676a0e4b9bc69ae8bb0dc3
Load ediff-*.el files silently.
(ediff-display-pixel-width, ediff-display-pixel-height): Declare as functions.

diff -r 0230fa103dd6 -r ab1a84d62068 lisp/ediff-wind.el
--- a/lisp/ediff-wind.el	Tue Nov 27 04:01:42 2007 +0000
+++ b/lisp/ediff-wind.el	Tue Nov 27 04:02:18 2007 +0000
@@ -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-util)
-	(load "ediff-util.el" nil nil 'nosuffix))
+	(load "ediff-util.el" nil t 'nosuffix))
     (or (featurep 'ediff-help)
-	(load "ediff-help.el" nil nil 'nosuffix))
+	(load "ediff-help.el" nil t 'nosuffix))
     (or (featurep 'ediff-tbar)
 	(featurep 'emacs)
 	(load "ediff-tbar.el" 'noerror nil 'nosuffix))
@@ -147,6 +147,10 @@
   :type 'function
   :group 'ediff-window)
 
+;; Definitions hidden from the compiler by compat wrappers.
+(declare-function ediff-display-pixel-width "ediff-init")
+(declare-function ediff-display-pixel-height "ediff-init")
+
 (defconst ediff-control-frame-parameters
   (list
    '(name . "Ediff")