Merge branch 'master' into development

2 files changed, 6 insertions, 1 deletions

diff --git a/history.txt b/history.txt
index ff38bfb..edbf4d0 100755
--- a/history.txt
+++ b/history.txt
@@ -2390,3 +2390,7 @@ ______
 141206
 ------
 * Store: Fixed #668
+
+141211
+------
+* Threads: yield after each cycle in the experimental “forEach” primitive
diff --git a/threads.js b/threads.js
index 5726af3..c293af6 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2014-December-04';
+modules.threads = '2014-December-11';
 
 var ThreadManager;
 var Process;
@@ -1734,6 +1734,7 @@ Process.prototype.doForEach = function (upvar, list, script) {
     );
     if (index > list.length()) {return; }
     this.context.inputs[3] += 1;
+    this.pushContext('doYield');
     this.pushContext();
     this.evaluate(script, new List(), true);
 };