[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/11/27 04:02:18

Index: ediff-wind.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-wind.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- ediff-wind.el       15 Nov 2007 16:43:40 -0000      1.51
+++ ediff-wind.el       27 Nov 2007 04:02:18 -0000      1.52
@@ -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")