another bug fix

Author: jdegoes

output/examples.js

@@ -235,7 +235,7 @@ module Control.Monad.Aff
   """ :: forall e1 e2 a. Aff e1 a -> Aff e2 a
 
   foreign import _forkAff """
-    function _forkAff(canceler, aff) {
+    function _forkAff(nonCanceler, aff) {
       var voidF = function(){};
 
       return function(success, error) {
@@ -247,7 +247,7 @@ module Control.Monad.Aff
           error(e);
         }
 
-        return canceler;
+        return nonCanceler;
       };
     }
   """ :: forall e a. Fn2 (Canceler e) (Aff e a) (Aff e (Canceler e))

src/Control/Monad/Aff.purs

@@ -56,7 +56,7 @@ module Control.Monad.Aff.Par
         ve <- makeVar' 0  -- the error count (starts at 0)
         c1 <- forkAff $ attempt a1 >>= either (maybeKill va ve) (putVar va)
         c2 <- forkAff $ attempt a2 >>= either (maybeKill va ve) (putVar va)
-        (takeVar va) -- `cancelWith` (c1 <> c2)
+        (takeVar va) `cancelWith` (c1 <> c2)
 
   instance plusPar :: Plus (Par e) where
     empty = Par empty