Simplify compilation requirements.

9 files changed, 18 insertions, 73 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1584e1a0fe9..47f99da80d1 100644
--- a/lisp/ChangeLog
+++ b/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):
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index d9d2b2458b9..f1b6bb40677 100644
--- a/lisp/ediff-diff.el
+++ b/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)
 
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 4b1a4b527ef..c26054c8a28 100644
--- a/lisp/ediff-help.el
+++ b/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)
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index a6cb13c7dee..1a1c6f6d21a 100644
--- a/lisp/ediff-merg.el
+++ b/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)
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 443ebdcbed6..e2fd1ff3acd 100644
--- a/lisp/ediff-mult.el
+++ b/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)
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index f8d0810bd9d..b2775816a8c 100644
--- a/lisp/ediff-ptch.el
+++ b/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)
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 120228cca84..27a9c097d48 100644
--- a/lisp/ediff-util.el
+++ b/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))
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 5e698c39ebb..0825872cced 100644
--- a/lisp/ediff-wind.el
+++ b/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)
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 6abcb242c75..80e121b6cda 100644
--- a/lisp/ediff.el
+++ b/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)