From 06f63847e02eee877e27b38bb855ebe92d8f0a25 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 5 Mar 2015 13:44:59 -0800
Subject: [PATCH] Fix brokenness.

---
 common/content/mappings.js | 3 ++-
 common/modules/buffer.jsm  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/content/mappings.js b/common/content/mappings.js
index b4929b5e..742d667d 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -375,7 +375,8 @@ var Mappings = Module("mappings", {
                 return key;
             }).flatten().array;
 
-            res = util.debrace(globbed).map(k => DOM.Event.canonicalKeys(k));
+            res = util.debrace(globbed)
+                      .map(k => DOM.Event.canonicalKeys(k));
         }
 
         if (keys != arguments[0])
diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 1daa6dd2..01021bb9 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -13,10 +13,11 @@ defineModule("buffer", {
 
 lazyRequire("bookmarkcache", ["bookmarkcache"]);
 lazyRequire("contexts", ["Group"]);
+lazyRequire("downloads", ["Downloads"]);
 lazyRequire("io", ["io"]);
 lazyRequire("finder", ["RangeFind"]);
 lazyRequire("overlay", ["overlay"]);
-lazyRequire("promises", ["Promise", "promises"]);
+lazyRequire("promises", ["CancelablePromise", "Promise", "promises"]);
 lazyRequire("sanitizer", ["sanitizer"]);
 lazyRequire("storage", ["File", "storage"]);
 lazyRequire("template", ["template"]);
@@ -821,7 +822,7 @@ var Buffer = Module("Buffer", {
                 params.isPrivate = privacy.usePrivateBrowsing;
             }
 
-            let download = Downloads.createDownload({
+            let download = yield Downloads.createDownload({
                 source: {
                     url: params.uri.spec,
                     isPrivate: params.isPrivate,