From 0307817e4de44d70b63d06f8c48d5bbea30394c4 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 8 Oct 2011 04:36:14 -0400
Subject: [PATCH] Don't commafy charlist options in :set output.

---
 common/modules/buffer.jsm  | 2 +-
 common/modules/finder.jsm  | 3 ++-
 common/modules/options.jsm | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 019abd60..b2939a98 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -515,7 +515,7 @@ var Buffer = Module("Buffer", {
         }
         else {
             let w = win.innerWidth;
-            rect = { x: w / 2 - w / 10, y: 0, width: w / 5, height: win.innerHeight };
+            rect = { x: w / 3, y: 0, width: w / 3, height: win.innerHeight };
         }
 
         var reduce = function (a, b) DOM(a).rect.top < DOM(b).rect.top ? a : b;
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 9a5316e4..1cdffec1 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -114,6 +114,7 @@ var RangeFinder = Module("rangefinder", {
             this.rangeFind.highlighted = highlighted;
             this.rangeFind.selections = selections;
         }
+        this.rangeFind.pattern = str;
         if (str)
             this.lastFindPattern = str;
         return pattern;
@@ -145,7 +146,7 @@ var RangeFinder = Module("rangefinder", {
                                                    | this.commandline.FORCE_SINGLELINE);
         }
         else
-            this.commandline.echo((this.rangeFind.backward ? "?" : "/") + this.lastFindPattern,
+            this.commandline.echo((this.rangeFind.backward ? "?" : "/") + this.rangeFind.pattern,
                                   "Normal", this.commandline.FORCE_SINGLELINE);
 
         if (this.options["hlfind"])
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index a1a0dbf7..4651ee94 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -863,8 +863,10 @@ var Options = Module("options", {
                             option.pre = "no";
                         option.default = (opt.defaultValue ? "" : "no") + opt.name;
                     }
-                    else if (isArray(opt.value))
-                        option.value = <>={template.map(opt.value, function (v) template.highlight(String(v)), <>,<span style="width: 0; display: inline-block"> </span></>)}</>;
+                    else if (isArray(opt.value) && opt.type != "charlist")
+                        option.value = <>={template.map(opt.value,
+                            function (v) template.highlight(String(v)),
+                            <>,<span style="width: 0; display: inline-block"> </span></>)}</>;
                     else
                         option.value = <>={template.highlight(opt.stringValue)}</>;
                     yield option;