From 117baf311fa236ead861058853c280e3750ec166 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 28 Sep 2011 20:48:27 -0400
Subject: [PATCH] Fix option shortname clashes.

---
 common/content/buffer.js        | 4 ++--
 common/locale/en-US/options.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 176c6053..22b16d0a 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -2272,11 +2272,11 @@ var Buffer = Module("buffer", {
                 }
             });
 
-        options.add(["scrolltime", "st"],
+        options.add(["scrolltime", "sct"],
             "The time, in milliseconds, in which to smooth scroll to a new position",
             "number", 100);
 
-        options.add(["scrollsteps", "ss"],
+        options.add(["scrollsteps", "scs"],
             "The number of steps in which to smooth scroll to a new position",
             "number", 5,
             {
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index f1a9975a..26c40db8 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -1383,7 +1383,7 @@
 
 <item>
     <tags>'ss' 'scrollsteps'</tags>
-    <spec>'scrollsteps' 'ss'</spec>
+    <spec>'scrollsteps' 'scs'</spec>
     <type>&option.scrollsteps.type;</type>
     <default>&option.scrollsteps.default;</default>
     <description>
@@ -1395,7 +1395,7 @@
 </item>
 <item>
     <tags>'st' 'scrolltime'</tags>
-    <spec>'scrolltime' 'st'</spec>
+    <spec>'scrolltime' 'sct'</spec>
     <type>&option.scrolltime.type;</type>
     <default>&option.scrolltime.default;</default>
     <description>