* mh-e.el: Just require mh-loaddefs since loading it in an

eval-and-compile block causes compilation errors in XEmacs.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 38ee394126092447d36029b9a556419ec9b65652..365c444d591ba68fe22b7c305f283e5c31e5ca62 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-04  Bill Wohler  <wohler@newt.com>
 
+       * mh-e.el: Just require mh-loaddefs since loading it in an
+       eval-and-compile block causes compilation errors in XEmacs.
+
        * mh-acros.el,  mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:
        * mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
        mh-do-in-xemacs block.

diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index eae7529e4d4b4fc1e0ac29a4dd66b43d7caa252b..87272b1c83b44a410c2a481ffa0be94a3933306b 100644 (file)
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -90,10 +90,7 @@
 ;; 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.
-(eval-and-compile
-  ;; Load it during compilation as well, since it defines the macro
-  ;; mh-require-cl.
-  (load "mh-loaddefs" nil 'nomessage))
+(require 'mh-loaddefs)
 
 (mh-require-cl)