From c3e76d9a5168b26d387892522aebb7cf2204b3c7 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 7 Sep 2011 07:29:01 -0400
Subject: [PATCH] Marginally better parsing of :set! preference names.

---
 common/modules/options.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 920d3565..ec08d861 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -1096,7 +1096,7 @@ var Options = Module("options", {
                     }
                     else {
                         var [matches, name, postfix, valueGiven, operator, value] =
-                            arg.match(/^\s*?([^=]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
+                            arg.match(/^\s*?((?:[^=\\']|\\.|'[^']*')+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
                         reset = (postfix == "&");
                         invertBoolean = (postfix == "!");
                     }