[Guile-commits] 30/36: deprecated eval-when situations

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-elisp
in repository guile.

commit 7bfd2ba132b02d8ae208bccbd5886deca3baf5f2
Author: Robin Templeton <address@hidden>
Date:   Mon Aug 11 06:55:11 2014 -0400

    deprecated eval-when situations
    
    (Best-ability ChangeLog annotation added by Christopher Allan Webber.)
    
    * module/language/elisp/compile-tree-il.scm (eval-when): Update.
---
 module/language/elisp/compile-tree-il.scm |    9 ++++++---
 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 22b437b..9f2b10c 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?