From 685a0f5d308f96252da05af4572d0947b121e2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
Date: Tue, 25 Jan 2011 11:34:44 +0100
Subject: [PATCH] Remove stray reference to 'laststatus'. Closes issue #305.

---
 common/content/statusline.js | 2 +-
 common/locale/en-US/gui.xml  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/content/statusline.js b/common/content/statusline.js
index 090366ed..b01125eb 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -12,7 +12,7 @@ var StatusLine = Module("statusline", {
     init: function () {
         this._statusLine = document.getElementById("status-bar");
         this.statusBar = document.getElementById("addon-bar") || this._statusLine;
-        this.statusBar.collapsed = true; // it is later restored unless the user sets laststatus=0
+        this.statusBar.collapsed = true;
         this.baseGroup = this.statusBar == this._statusLine ? "StatusLine " : "";
 
         if (this.statusBar.localName == "toolbar") {
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index e7054858..ed6e13e9 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -211,8 +211,9 @@
 <h2 tag="status-line status-bar">Status line</h2>
 
 <p>
-    The status line appears at the bottom of each window. The <o>laststatus</o>
-    option can be used to specify when the status line appears.
+    The status line appears at the bottom of each window. You can use
+    <o>guioptions</o> to specify if and when the status line appears, as well
+    as its relation to the command line and messages.
 </p>
 
 <p>