From 93f89c9573b82cb28230b6b14a8a7a9ccb386cd5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 24 Jan 2011 16:58:38 +1100
Subject: [PATCH 1/3] Mention the FAQ in about:pentadactyl.

Disable the reference to the currently missing :help version page.
---
 common/content/about.xul | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/content/about.xul b/common/content/about.xul
index 0d97951d..353a2eea 100644
--- a/common/content/about.xul
+++ b/common/content/about.xul
@@ -21,7 +21,10 @@ by Kris Maglione, Doug Kearns, et al.
 
 type :q&lt;<span class="key">Enter</span>>                 to exit         <!---->
 type :help&lt;<span class="key">Enter</span>>  or  &lt;<span class="key">F1</span>>    for on-line help
+type :help faq&lt;<span class="key">Enter</span>>          for the FAQ page
+<!--
 type :help version-&dactyl.version;&lt;<span class="key">Enter</span>>  for version info
+-->
       </div>
     <spring flex="1"/>
   </hbox>

From 51aa3ebc61d9874a8eb9fb0fc6b8377ecd8493cf Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 24 Jan 2011 05:16:38 -0500
Subject: [PATCH 2/3] Fix padding for nested Add-on Bar buttons.

--HG--
extra : rebase_source : 9e2ffe6ebd8da5ea8c8284cf654dbfce1e4c213a
---
 common/content/statusline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/content/statusline.js b/common/content/statusline.js
index e5e842e2..84bafca4 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -29,7 +29,7 @@ var StatusLine = Module("statusline", {
                     -moz-appearance: none !important;
                     <padding>
                 }
-                !AddonButton;#addon-bar>xul|toolbarbutton  {
+                !AddonButton;#addon-bar>xul|toolbarbutton,#addon-bar>xul|toolbarbutton>xul|toolbarbutton  {
                     -moz-appearance: none !important;
                     padding: 0 !important;
                     border-width: 0px !important;

From 1ec71c11c6064ceacd0d6192bf119473b6941f73 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 24 Jan 2011 05:20:34 -0500
Subject: [PATCH 3/3] Merge change from key-processing. Closes issue #303.

---
 common/content/commandline.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 3ab022e6..63d86d07 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1224,17 +1224,19 @@ var CommandLine = Module("commandline", {
     },
 
     withOutputToString: function (fn, self) {
-        let buffer = [];
         dactyl.registerObserver("echoLine", observe, true);
         dactyl.registerObserver("echoMultiline", observe, true);
+
+        let output = [];
         function observe(str, highlight, dom) {
-            buffer.push(dom && !isString(str) ? util.domToString(dom) : str);
+            output.push(dom && !isString(str) ? dom : str);
         }
 
         this.savingOutput = true;
         dactyl.trapErrors.apply(dactyl, [fn, self].concat(Array.slice(arguments, 2)));
         this.savingOutput = false;
-        return buffer.join("\n");
+        return output.map(function (elem) elem instanceof Node ? util.domToString(elem) : elem)
+                     .join("\n");
     }
 }, {
     /**