aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2008-01-17 13:03:56 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2008-01-17 13:03:56 +0000
commitd502b5bcdc165a7164ba4cff90f982a08e173b2c (patch)
tree4ab04d550b3d9371e3571c96e963ad4a174882da
parent5763eb8f7874589a77fd079b7d196fd515930c4e (diff)
Revert to more reliable true eval-when (compile)
-rw-r--r--generic/proof-maths-menu.el7
-rw-r--r--generic/proof-mmm.el6
2 files changed, 8 insertions, 5 deletions
diff --git a/generic/proof-maths-menu.el b/generic/proof-maths-menu.el
index c6a59454..aa6e7d40 100644
--- a/generic/proof-maths-menu.el
+++ b/generic/proof-maths-menu.el
@@ -20,9 +20,10 @@
(eval-when-compile
(require 'proof-utils) ; for proof-ass, proof-eval-when-ready-for-assistant
- (if noninteractive ; batch byte compilation
- (unless (featurep 'xemacs)
- (require 'maths-menu)))) ; it's loaded dynamically at runtime
+ (require 'cl))
+
+(eval-when (compile)
+ (require 'maths-menu)) ; it's loaded dynamically at runtime
;;;###autoload
diff --git a/generic/proof-mmm.el b/generic/proof-mmm.el
index d82d55d5..d726b731 100644
--- a/generic/proof-mmm.el
+++ b/generic/proof-mmm.el
@@ -23,8 +23,10 @@
(eval-when-compile
(require 'proof-utils) ; for proof-ass, proof-eval-when-ready-for-assistant
- (if noninteractive ; batch byte compilation
- (require 'mmm-auto))) ; it's loaded dynamically at runtime
+ (require 'cl))
+
+(eval-when (compile)
+ (require 'mmm-auto)) ; it's loaded dynamically at runtime
(require 'proof-site)