diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-05-03 20:53:53 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-05-03 20:53:53 +0000 |
| commit | 8480ec72e18ae59cb4cefcdd4530b93f26759a88 (patch) | |
| tree | 043c82be95acbbb3b9471d947458b34481b2885d /lisp/ediff-util.el | |
| parent | 6faa677936d7fbfa3042a4a9398bf58d35b99fb0 (diff) | |
| download | emacs-8480ec72e18ae59cb4cefcdd4530b93f26759a88.tar.gz | |
Simplify compilation requirements.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 19 |
1 files changed, 2 insertions, 17 deletions
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)) |