diff options
| author | Glenn Morris | 2008-05-03 20:53:53 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-05-03 20:53:53 +0000 |
| commit | 8480ec72e18ae59cb4cefcdd4530b93f26759a88 (patch) | |
| tree | 043c82be95acbbb3b9471d947458b34481b2885d /lisp/ediff-diff.el | |
| parent | 6faa677936d7fbfa3042a4a9398bf58d35b99fb0 (diff) | |
| download | emacs-8480ec72e18ae59cb4cefcdd4530b93f26759a88.tar.gz emacs-8480ec72e18ae59cb4cefcdd4530b93f26759a88.zip | |
Simplify compilation requirements.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 11 |
1 files changed, 1 insertions, 10 deletions
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 @@ | |||
| 29 | 29 | ||
| 30 | (provide 'ediff-diff) | 30 | (provide 'ediff-diff) |
| 31 | 31 | ||
| 32 | ;; compiler pacifier | ||
| 33 | (defvar ediff-default-variant) | ||
| 34 | (defvar null-device) | ||
| 35 | (defvar longlines-mode) | ||
| 36 | |||
| 37 | (eval-when-compile | 32 | (eval-when-compile |
| 38 | (require 'ediff-init) | 33 | (require 'ediff-util)) |
| 39 | (if (not (featurep 'ediff-util)) | ||
| 40 | (require 'ediff-util)) | ||
| 41 | ) | ||
| 42 | ;; end pacifier | ||
| 43 | 34 | ||
| 44 | (require 'ediff-init) | 35 | (require 'ediff-init) |
| 45 | 36 | ||