Simplify compilation requirements.

lisp/ChangeLog

@@ -1,3 +1,11 @@
+2008-05-03  Glenn Morris  <rgm@gnu.org>
+
+	* ediff-diff.el, ediff-help.el, ediff-merg.el, ediff-mult.el:
+	* ediff-ptch.el, ediff-util.el, ediff-wind.el, ediff.el:
+	Simplify compilation requirements.
+	* ediff-init.el, ediff-vers.el: Remove unnecessary variable
+	declarations.
+
 2008-05-03  Dave Love  <fx@gnu.org>
 
 	* progmodes/python.el (python-beginning-of-statement):

lisp/ediff-diff.el

@@ -29,17 +29,8 @@
 
 (provide 'ediff-diff)
 
-;; compiler pacifier
-(defvar ediff-default-variant)
-(defvar null-device)
-(defvar longlines-mode)
-
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  )
-;; end pacifier
+  (require 'ediff-util))
 
 (require 'ediff-init)
 

lisp/ediff-help.el

@@ -29,10 +29,6 @@
 
 ;; Compiler pacifier start
 (defvar ediff-multiframe)
-
-(eval-when-compile
-  (require 'ediff-init)
-  )
 ;; end pacifier
 
 (require 'ediff-init)

lisp/ediff-merg.el

@@ -35,9 +35,7 @@
 (defvar ediff-window-config-saved)
 
 (eval-when-compile
-  (require 'ediff-init)
-  (require 'ediff-util)
-  )
+  (require 'ediff-util))
 ;; end pacifier
 
 (require 'ediff-init)

lisp/ediff-mult.el

@@ -115,13 +115,8 @@
 
 ;; compiler pacifier
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  (if (not (featurep 'ediff-ptch))
-      (require 'ediff-ptch))
-  (require 'ediff)
-  )
+  (require 'ediff-ptch)
+  (require 'ediff))
 ;; end pacifier
 
 (require 'ediff-init)

lisp/ediff-ptch.el

@@ -36,18 +36,8 @@
   :group 'ediff)
 
 ;; compiler pacifier
-(defvar ediff-window-A)
-(defvar ediff-window-B)
-(defvar ediff-window-C)
-(defvar ediff-use-last-dir)
-(defvar ediff-shell)
-
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (require 'ediff)
-  )
+  (require 'ediff))
 ;; end pacifier
 
 (require 'ediff-init)

lisp/ediff-util.el

@@ -30,8 +30,6 @@
 (provide 'ediff-util)
 
 ;; Compiler pacifier
-(defvar ediff-patch-diagnostics)
-(defvar ediff-patchbufer)
 (defvar ediff-use-toolbar-p)
 (defvar ediff-toolbar-height)
 (defvar ediff-toolbar)
@@ -47,20 +45,8 @@
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
 (eval-when-compile
-  (require 'ediff-init)
-  (require 'ediff-help)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (require 'ediff-mult)
-  (require 'ediff-wind)
-  (if (not (featurep 'ediff-diff))
-      (require 'ediff-diff))
-  (require 'ediff-merg)
-  (require 'ediff)
-  ;; for compatibility with current stable version of xemacs
-  (if (featurep 'xemacs)
-      (require 'ediff-tbar))
-  )
+  (require 'ediff))
+
 ;; end pacifier
 
 
@@ -70,7 +56,6 @@
 (require 'ediff-wind)
 (require 'ediff-diff)
 (require 'ediff-merg)
-
 ;; for compatibility with current stable version of xemacs
 (if (featurep 'xemacs)
     (require 'ediff-tbar))

lisp/ediff-wind.el

@@ -44,14 +44,9 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
-
 (eval-when-compile
-  (require 'ediff-init)
   (require 'ediff-util)
-  (require 'ediff-help)
-  (if (featurep 'xemacs)
-      (require 'ediff-tbar))
-  )
+  (require 'ediff-help))
 ;; end pacifier
 
 (require 'ediff-init)

lisp/ediff.el

@@ -115,27 +115,14 @@
 (provide 'ediff)
 
 ;; Compiler pacifier
-(defvar cvs-cookie-handle)
-(defvar ediff-last-dir-patch)
-(defvar ediff-patch-default-directory)
-(defvar ediff-control-window)
-
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
 
 (eval-when-compile
   (require 'dired)
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  (require 'ediff-wind)
-  (if (not (featurep 'ediff-ptch))
-      (require 'ediff-ptch))
-  (require 'ediff-vers)
-  )
+  (require 'ediff-util)
+  (require 'ediff-ptch))
 ;; end pacifier
 
 (require 'ediff-init)