Mercurial > emacs
changeset 86469:ab1a84d62068
Load ediff-*.el files silently.
(ediff-display-pixel-width, ediff-display-pixel-height): Declare as functions.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 27 Nov 2007 04:02:18 +0000 |
| parents | 0230fa103dd6 |
| children | c91f81134a74 |
| files | lisp/ediff-wind.el |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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")