From fc52da1af52f4eebdfa2bfa2be8cc0d5e00c271b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 25 Feb 2014 08:59:48 -0800
Subject: [PATCH] Fix `validateCompleter` for non-string options.

--HG--
extra : rebase_source : 61572ff0037fddbc3ec06af8040e7ca4d4bb3096
---
 common/modules/options.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index c9626813..7dabc9ba 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -740,9 +740,9 @@ var Option = Class("Option", {
             acceptable = completions.call(this);
 
         if (isArray(acceptable))
-            acceptable = RealSet(acceptable.map(([k]) => (k)));
+            acceptable = RealSet(acceptable.map(([k]) => k));
         else
-            acceptable = RealSet(Object.keys(acceptable));
+            acceptable = RealSet(this.parse(k) for (k in Object.keys(acceptable)));
 
         if (this.type === "regexpmap" || this.type === "sitemap")
             return Array.concat(vals).every(re => acceptable.has(re.result));