Load mh-loaddefs during compilation as well.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0ad943588bd..f67ba5600b4 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mh-e.el: Load mh-loaddefs during compilation as well.
+
 2009-11-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * mh-e.el (mh-loaddefs): Load rather than require.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 7b7a9e5d9b5..916bbe29834 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -92,7 +92,10 @@
 ;; Provide functions to the rest of MH-E. However, mh-e.el must not
 ;; use any definitions in files that require mh-e from mh-loaddefs,
 ;; for if it does it will introduce a require loop.
-(load "mh-loaddefs" nil 'nomessage)
+(eval-and-compile
+  ;; Load it during compilation as well, since it defines the macro
+  ;; mh-require-cl.
+  (load "mh-loaddefs" nil 'nomessage))
 
 (mh-require-cl)