From: Bill Wohler <wohler@newt.com>
Date: Mon, 4 Jul 2011 02:53:16 +0000 (-0700)
Subject: * mh-e.el: Just require mh-loaddefs since loading it in an
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~207
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92ec073e6441e7abfdc49c7734a880fecdf2d1f3;p=emacs.git

* 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 38ee3941260..365c444d591 100644
--- 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 eae7529e4d4..87272b1c83b 100644
--- 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)