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-mult.el | |
| parent | 6faa677936d7fbfa3042a4a9398bf58d35b99fb0 (diff) | |
| download | emacs-8480ec72e18ae59cb4cefcdd4530b93f26759a88.tar.gz | |
Simplify compilation requirements.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 9 |
1 files changed, 2 insertions, 7 deletions
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) |