From f8eb9b021fc179b49cf0f853e15cb47c9ef213df Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 5 Oct 2010 14:35:32 -0400
Subject: [PATCH] Make | the default 'urlseparator'.

---
 common/content/browser.js       | 4 ----
 common/content/dactyl.js        | 4 ++++
 common/locale/en-US/options.xml | 4 ++--
 pentadactyl/NEWS                | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/content/browser.js b/common/content/browser.js
index 63eb7446..9e9ae0af 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -51,10 +51,6 @@ const Browser = Module("browser", {
                 },
                 completer: function (context) completion.charset(context)
             });
-
-        options.add(["urlseparator"],
-            "Set the separator regex used to separate multiple URL args",
-            "string", ",\\s");
     },
 
     mappings: function () {
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index c4d13a24..02291439 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1269,6 +1269,10 @@ const Dactyl = Module("dactyl", {
                 }
             });
 
+        options.add(["urlseparator"],
+            "Set the separator regex used to separate multiple URL args",
+            "string", "|");
+
         options.add(["verbose", "vbs"],
             "Define which info messages are displayed",
             "number", 1,
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index c2942075..6a097e9e 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -1331,10 +1331,10 @@
 </item>
 
 <item>
-    <tags>'urlseparator'</tags>
+    <tags>'us' 'urlseparator'</tags>
     <spec>'urlseparator'</spec>
     <type>string</type>
-    <default>,\s</default>
+    <default>|</default>
     <description>
         <p>
             The regular expression used to split URL lists in commands
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 70151b6a..e6400105 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -61,6 +61,7 @@
     * Added 'hintkeys' option.
     * Added "transliterated" option to 'hintmatching'.
     * Replaced 'focuscontent' with 'strictfocus'.
+    * Changed 'urlseparator' default value to '|'
     * Added 'wildanchor' option.
     * Added -javascript option to :abbrev and :map.
     * Added several new options to :map.