From e819e7616d04f0fe5c15c14abfbf137a0bb8770f Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 25 Feb 2015 12:10:35 -0800
Subject: [PATCH] Fix brokenness.

---
 common/modules/base.jsm       |  2 +-
 common/modules/completion.jsm | 10 ++++++++--
 common/modules/options.jsm    |  2 +-
 common/modules/styles.jsm     |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 14d36d5a..2c58a36c 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -1724,7 +1724,7 @@ update(iter, {
 const Iter = Class("Iter", {
     init: function init(iter) {
         this.iter = iter;
-        if ("__iterator__" in iter)
+        if (!(Symbol.iterator in iter) && "__iterator__" in iter)
             this.iter = iter.__iterator__();
 
         if (this.iter.finalize)
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index b6b3c4b8..ea5b8287 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -492,8 +492,11 @@ var CompletionContext = Class("CompletionContext", {
         // Item formatters
         this.processor = Array.slice(this.process);
         if (!this.anchored)
-            this.processor[0] = function processor_0(item, text) self.process[0].call(self, item,
+            this.processor[0] = function processor_0(item, text) {
+                return self.process[0].call(
+                    self, item,
                     template.highlightFilter(item.text, self.filter, null, item.isURI));
+            };
 
         try {
             // Item prototypes
@@ -659,7 +662,10 @@ var CompletionContext = Class("CompletionContext", {
                 }
                 catch (e) {
                     util.reportError(e);
-                    util.dump(util.prettifyJSON(this.createRow(this.items[idx]), null, true));
+                    try {
+                        util.dump(util.prettifyJSON(this.createRow(this.items[idx]), null, true));
+                    }
+                    catch (e) {}
                     cache[idx] = DOM.fromJSON(
                         ["div", { highlight: "CompItem", style: "white-space: nowrap" },
                             ["li", { highlight: "CompResult" }, this.text + "\u00a0"],
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 7a1f51ae..a6b6d9dd 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -754,7 +754,7 @@ var Option = Class("Option", {
             acceptable = completions.call(this);
 
         if (isArray(acceptable))
-            acceptable = new RealSet(acceptable.map(([k]) => k));
+            acceptable = new RealSet(acceptable.map((v) => v[0]));
         else
             acceptable = new RealSet(this.parseKey(k)
                                      for (k of Object.keys(acceptable)));
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 65d4d9b7..79dc354e 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -612,7 +612,7 @@ var Styles = Module("Styles", {
                     let sheet = args["-group"].get(args["-name"]);
                     if (args.completeArg == 0) {
                         if (sheet)
-                            context.completions = [[sheet.sites.join(","), "Current Value"]];
+                            context.completions = [[sheet.sites.join(","), _("option.currentValue")]];
                         context.fork("sites", 0, Styles, "completeSite", window.content, args["-group"]);
                     }
                     else if (args.completeArg == 1) {