summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Templeton <robin@terpri.org>2014-08-11 06:55:11 -0400
committerRicardo Wurmus <rekado@elephly.net>2020-04-04 16:25:55 +0200
commit2b5b8e5ff82fb228eb03e4b97215191dcc857822 (patch)
tree005a69097dfc54862a971e17cefcb4a5afe4182d
parentcec2f415fb0d113787a16cdba7bded27f2e6dfc2 (diff)
deprecated eval-when situations
(Best-ability ChangeLog annotation added by Christopher Allan Webber.) * module/language/elisp/compile-tree-il.scm (eval-when): Update.
-rw-r--r--module/language/elisp/compile-tree-il.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/module/language/elisp/compile-tree-il.scm b/module/language/elisp/compile-tree-il.scm
index c683545d2..0e5e535d8 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -474,9 +474,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?