Replace 'ignorecase' and 'smartcase' with 'searchcase'.

common/locale/en-US/options.xml

@@ -869,17 +869,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'noic' 'noignorecase'</tags>
-    <tags>'ic' 'ignorecase'</tags>
-    <spec>'ignorecase' 'ic'</spec>
-    <type>boolean</type>
-    <default>on</default>
-    <description>
-        <p>Ignore case in search patterns.</p>
-    </description>
-</item>
-
 <item>
     <tags>'nois' 'noincsearch'</tags>
     <tags>'is' 'incsearch'</tags>
@@ -1282,6 +1271,22 @@
     </description>
 </item>
 
+<item>
+    <tags>'sc' 'searchcase'</tags>
+    <spec>'searchcase'</spec>
+    <type>string</type>
+    <default>smart</default>
+    <description>
+        <p>Search case matching mode.</p>
+
+        <dl>
+            <dt>ignore</dt> <dd>Case is never significant</dd>
+            <dt>match</dt> <dd>Case is always significant</dd>
+            <dt>smart</dt> <dd>Case is significant when capital letters are typed</dd>
+        </dl>
+    </description>
+</item>
+
 <item>
     <tags>'shell' 'sh'</tags>
     <spec>'shell' 'sh'</spec>
@@ -1354,21 +1359,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'noscs' 'nosmartcase'</tags>
-    <tags>'scs' 'smartcase'</tags>
-    <spec>'smartcase' 'scs'</spec>
-    <type>boolean</type>
-    <default>on</default>
-    <description>
-        <p>
-            Override the <o>ignorecase</o> option if the pattern contains
-            uppercase characters.  This is only used if the <o>ignorecase</o>
-            option is set.
-        </p>
-    </description>
-</item>
-
 <item>
     <tags>'nosf' 'nostrictfocus'</tags>
     <tags>'sf' 'strictfocus'</tags>