diff lisp/ediff-wind.el @ 87691:f2c8fd594360

2008-01-10 Michael Kifer <[e-mail]> * ediff*.el: uncommented declare-function. * viper*.el: uncommented declare-function.

--- a/lisp/ediff-wind.el	Thu Jan 10 04:08:55 2008 +0000
+++ b/lisp/ediff-wind.el	Thu Jan 10 06:54:12 2008 +0000
@@ -40,6 +40,11 @@
 (defvar frame-icon-title-format)
 (defvar ediff-diff-status)
 
+;; declare-function does not exist in XEmacs
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
+
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
     (or (featurep 'ediff-init)
@@ -147,10 +152,9 @@
   :type 'function
   :group 'ediff-window)
 
-;; declare-function does not exist in XEmacs
 ;; Definitions hidden from the compiler by compat wrappers.
-;;(declare-function ediff-display-pixel-width "ediff-init")
-;;(declare-function ediff-display-pixel-height "ediff-init")
+(declare-function ediff-display-pixel-width "ediff-init")
+(declare-function ediff-display-pixel-height "ediff-init")
 
 (defconst ediff-control-frame-parameters
   (list