summaryrefslogtreecommitdiff
path: root/lisp/ediff-mult.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-mult.el')
-rw-r--r--lisp/ediff-mult.el9
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)