From e99660f57080ed19e81fb86f3f31122f9ac4bad5 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 19 Sep 2011 14:24:19 -0400
Subject: [PATCH] Fix 'downloadsort' help entry. Stuff.

---
 common/locale/en-US/messages.properties | 3 +++
 common/locale/en-US/options.xml         | 5 +++--
 common/modules/commands.jsm             | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index c0d53b03..092a8688 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -124,6 +124,9 @@ dactyl.sourced-1 = Sourced: %S
 dactyl.prompt.openMany-1 = This will open %S new tabs. Would you like to continue? (yes/[no]):
 dactyl.yank-1 = Yank %S
 
+dactyl.cheerUp = Cheer up
+dactyl.somberDown = Somber down
+
 deprecated.for.theOptionsSystem = the options system
 
 dialog.notAvailable-1 = Dialog %S not available
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 36d10ad7..bf334dbd 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -534,8 +534,9 @@
 <item>
     <tags>'dls' 'dlsort' 'downloadsort'</tags>
     <spec>'downloadsort' 'dlsort' 'dls'</spec>
-    <type>stringlist</type>
-    <default>-active,+filename</default>
+    <strut/>
+    <type>&option.downloadsort.type;</type>
+    <default>&option.downloadsort.default;</default>
     <description>
         <p>
             <ex>:downloads</ex> sort order, in order of precedence.
diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index 28784a83..45b4d0d6 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -1183,7 +1183,7 @@ var Commands = Module("commands", {
                 (?P<count>    (?:\d+ | %)? )
                 (?P<fullCmd>
                     (?: (?P<group>   <name>) : )?
-                    (?P<cmd>      (?:<name> | !)? ))
+                    (?P<cmd>      (?:-? [()] | <name> | !)? ))
                 (?P<bang>     !?)
                 (?P<space>    \s*)
             )
@@ -1403,6 +1403,11 @@ var Commands = Module("commands", {
     commands: function initCommands(dactyl, modules, window) {
         const { commands, contexts } = modules;
 
+        commands.add(["(", "-("], "",
+            function (args) { dactyl.echoerr(_("dactyl.cheerUp")); });
+        commands.add([")", "-)"], "",
+            function (args) { dactyl.echoerr(_("dactyl.somberDown")); });
+
         commands.add(["com[mand]"],
             "List or define commands",
             function (args) {