From 92ec073e6441e7abfdc49c7734a880fecdf2d1f3 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sun, 3 Jul 2011 19:53:16 -0700 Subject: [PATCH] * mh-e.el: Just require mh-loaddefs since loading it in an eval-and-compile block causes compilation errors in XEmacs. --- lisp/mh-e/ChangeLog | 3 +++ lisp/mh-e/mh-e.el | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) 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 + * 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) -- 2.39.2