summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Templeton <robin@terpri.org>2014-08-11 06:55:11 -0400
committerChristopher Allan Webber <cwebber@dustycloud.org>2016-03-25 12:00:13 -0700
commit7bfd2ba132b02d8ae208bccbd5886deca3baf5f2 (patch)
treeed6a639d478107cf17cf7272365d5ca3db8b7a13
parent4455381dc7a3fccf2b9f84d55cf61bb1f6010f83 (diff)
downloadguile-7bfd2ba132b02d8ae208bccbd5886deca3baf5f2.tar.gz
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 22b437b9e..9f2b10c62 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -471,9 +471,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?