(idlwave-sintern-structtag): Declare as a function.

[gnu-emacs] / lisp / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 4efae0c0519097601083f56d5bff9158ddfac42a..e13d89ac6eb9318663f0fd75963372b1dc509ddb 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.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-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 @@ In this case, Ediff will use those frames to display these buffers."
   :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")