cwebber pushed a commit to branch wip-elisp-rebased
in repository guile.
commit f4a154f9dfb16e8a7bf9684b3db536af4dafffb3
Author: Robin Templeton <[email protected]>
AuthorDate: Mon Aug 11 06:55:11 2014 -0400
deprecated eval-when situations
(Best-ability ChangeLog annotation added by Christine Lemmer-Webber.)
* module/language/elisp/compile-tree-il.scm (eval-when): Update.
---
module/language/elisp/compile-tree-il.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/module/language/elisp/compile-tree-il.scm
b/module/language/elisp/compile-tree-il.scm
index b7df68d..ff49c3d 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -475,9 +475,12 @@
(defspecial eval-when (loc args)
(pmatch args
((,situations . ,forms)
- (let ((compile? (memq ':compile-toplevel situations))
- (load? (memq ':load-toplevel situations))
- (execute? (memq ':execute situations)))
+ (let ((compile? (or (memq ':compile-toplevel situations)
+ (memq 'compile situations)))
+ (load? (or (memq ':load-toplevel situations)
+ (memq 'load situations)))
+ (execute? (or (memq ':execute situations)
+ (memq 'eval situations))))
(cond
((not (fluid-ref toplevel?))
(if execute?
