From 64d0de28d3c84502a44bc2643c45a9f117437a08 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 12:57:37 +0000
Subject: [PATCH] remove "s" value from 'guioptions' as we now have
 'laststatus'

---
 NEWS               |  2 +-
 content/options.js | 39 +++++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 8f11c2c8..33d81b34 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 2007-xx-xx:
 	* version 0.6
 	* THIS VERSION ONLY WORKS WITH FIREFOX 3.0
-	* added new 'laststatus' option
+	* added new 'laststatus' option and removed "s" value from 'guioptions'
 	* Tab-completion improvements for :javascript and :open
 	* IMPORTANT: changed semantics of :echo and :echoerr: Strings must be quoted with " or ' now,
 	  but you can do things like :echo 3+2 or :echo window.document now
diff --git a/content/options.js b/content/options.js
index 53670fda..f68bc7fd 100644
--- a/content/options.js
+++ b/content/options.js
@@ -382,11 +382,13 @@ function Options() //{{{
     addOption(new Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",
-            help: "Available items:<br/><ul>" +
+            help: "Available items:<br/>" +
+                  "<ul>" +
                   "<li><b>s</b>: Search engines and keyword URLs</li>" +
                   "<li><b>f</b>: Local files</li>" +
                   "<li><b>b</b>: Bookmarks</li>" +
-                  "<li><b>h</b>: History</li></ul>" +
+                  "<li><b>h</b>: History</li>" +
+                  "</ul>" +
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
                   "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
             default_value: "sfbh",
@@ -426,14 +428,15 @@ function Options() //{{{
     addOption(new Option(["guioptions", "go"], "charlist",
         {
             short_help: "Show or hide the menu, toolbar and scrollbars",
-            help: "Supported characters:<br/><ul>" +
+            help: "Supported characters:<br/>" +
+                  "<ul>" +
                   "<li><b>m</b>: menubar</li>" +
                   "<li><b>T</b>: toolbar</li>" +
                   "<li><b>b</b>: bookmark bar</li>" +
-                  "<li><b>s</b>: statusbar</li></ul>",
+                  "</ul>",
             setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
-            default_value: "s",
-            validator: function (value) { if (/[^mTbs]/.test(value)) return false; else return true; }
+            default_value: "",
+            validator: function (value) { if (/[^mTb]/.test(value)) return false; else return true; }
         }
     ));
     addOption(new Option(["hintchars", "hc"], "charlist",
@@ -493,10 +496,12 @@ function Options() //{{{
         {
             short_help: "Show the status line",
             help: "Determines when the last window will have a status line. " +
-                  "Possible values:<br/><ul>" +
+                  "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: never</li>" +
                   "<li><b>1</b>: only if there are multiple windows</li>" +
-                  "<li><b>2</b>: always</li></ul>" +
+                  "<li><b>2</b>: always</li>" +
+                  "</ul>" +
                   "NOTE: laststatus=1 not implemented yet.",
             default_value: 2,
             setter: function(value) { Options.setPref("laststatus", value); setStatusLine(value); },
@@ -528,11 +533,13 @@ function Options() //{{{
         {
             short_help: "Where to show requested popup windows",
             help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
-                  "Possible values:<br/><ul>" +
+                  "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)</li>" +
                   "<li><b>1</b>: Always open in a new tab</li>" +
                   "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>"+
-                  "<li><b>3</b>: Always open in a new window</li></ul>" +
+                  "<li><b>3</b>: Always open in a new window</li>" +
+                  "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
             default_value: 1,
             setter: function(value) { Options.setPref("popups", value); setPopups(value); },
@@ -577,10 +584,12 @@ function Options() //{{{
         {
             short_help: "Show the destination of the link under the cursor in the status bar",
             help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " +
-                  "Possible values:<br/><ul>" +
+                  "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Don't show link destination</li>" +
                   "<li><b>1</b>: Show the link in the status line</li>" +
-                  "<li><b>2</b>: Show the link in the command line</li></ul>",
+                  "<li><b>2</b>: Show the link in the command line</li>" +
+                  "</ul>",
             default_value: 1,
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
@@ -588,10 +597,12 @@ function Options() //{{{
     addOption(new Option(["showtabline", "stal"], "number",
         {
             short_help: "Control when to show the tab bar of opened web pages",
-            help: "Possible values:<br/><ul>" +
+            help: "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Never show tab bar</li>" +
                   "<li><b>1</b>: Show tab bar only if more than one tab is open</li>" +
-                  "<li><b>2</b>: Always show tab bar</li></ul>" +
+                  "<li><b>2</b>: Always show tab bar</li>" +
+                  "</ul>" +
                   "NOTE: showtabline=1 not implemented yet and buggy with showtabline=0",
             setter: function(value) { Options.setPref("showtabline", value); setShowTabline(value); },
             default_value: 2,