From 31df6cc7471de91afb2c09accd57aa856edaf49a Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@vimperator.org>
Date: Fri, 30 Oct 2009 20:48:45 -0400
Subject: [PATCH 1/2] Add Google Code upload target to common Makefile.

---
 common/Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/common/Makefile b/common/Makefile
index e3d9e534..19c27d84 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -4,6 +4,7 @@ TOP           = $(shell pwd)
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 BASE          = $(TOP)/../common
+GOOGLE_PROJ   = vimperator-labs
 
 LOCALEDIR     = locale
 DOC_FILES     = $(wildcard $(LOCALEDIR)/*/*.xml)
@@ -56,6 +57,7 @@ help:
 	@echo "  make jar       - build a JAR ($(JAR))"
 	@echo "  make xpi       - build an XPI ($(XPI_NAME))"
 	@echo "  make release   - updates update.rdf (this is not for you)"
+	@echo "  make release   - uploads to Google Code (this is not for you)"
 	@echo "  make clean     - clean up"
 	@echo "  make distclean - clean up more"
 	@echo
@@ -72,6 +74,19 @@ jar: $(JAR)
 
 release: $(XPI) $(RDF)
 
+# This is not for you!
+dist: $(XPI)
+	[ -n "$(featured)" ] && labels="$$labels,Featured";             	\
+	proj=$$(echo -n $(NAME) | sed 's/\(.\).*/\1/' | tr a-z A-Z);    	\
+	proj="$$proj$$(echo $(NAME) | sed 's/.//')";                    	\
+	[ -z "$$description" ] && description="$$proj $(VERSION) Release"; 	\
+								        	\
+	labels=$$(echo -n "$$labels,Project-$$proj" | sed 's/^,*//g'); 		\
+										\
+	googlecode_upload -s "$$description" -l "$$labels" 			\
+		-p "$(GOOGLE_PROJ)" -u "$(GOOGLE_USER)" -w "$(GOOGLE_PASS)" 	\
+		-- "$(XPI)"
+
 $(RDF): $(RDF_IN) Makefile
 	@echo "Preparing release..."
 	$(SED) -e "s,###VERSION###,$(VERSION),g" \

From 28a512854f29cf03d7c7dc447a7f15088bbb78e1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@vimperator.org>
Date: Sat, 31 Oct 2009 13:20:01 -0400
Subject: [PATCH 2/2] Fix broken highlight groups.

---
 common/content/style.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/content/style.js b/common/content/style.js
index d006ce02..1c09ab2c 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -9,7 +9,7 @@
  * @constant
  * @property {string} The default highlighting rules. They have the
  * form:
- *    rule ::= selector space css
+ *    rule ::= selector space space+ css
  *    selector ::= group
  *               | group "," css-selector
  *               | group "," css-selector "," scope
@@ -44,21 +44,21 @@ Highlights.prototype.CSS = <![CDATA[
     CmdOutput   white-space: pre;
 
     CompGroup
-    CompGroup:not(:first-of-type) margin-top: .5em;
-    CompTitle          color: magenta; background: white; font-weight: bold;
-    CompTitle>*        padding: 0 .5ex;
-    CompMsg            font-style: italic; margin-left: 16px;
+    CompGroup:not(:first-of-type)  margin-top: .5em;
+    CompTitle            color: magenta; background: white; font-weight: bold;
+    CompTitle>*          padding: 0 .5ex;
+    CompMsg              font-style: italic; margin-left: 16px;
     CompItem
-    CompItem[selected] background: yellow;
-    CompItem>*         padding: 0 .5ex;
-    CompIcon           width: 16px; min-width: 16px; display: inline-block; margin-right: .5ex;
-    CompIcon>img       max-width: 16px; max-height: 16px; vertical-align: middle;
-    CompResult         width: 45%; overflow: hidden;
-    CompDesc           color: gray; width: 50%;
-    CompLess           text-align: center; height: 0;    line-height: .5ex; padding-top: 1ex;
-    CompLess::after    content: "\2303" /* Unicode up arrowhead */
-    CompMore           text-align: center; height: .5ex; line-height: .5ex; margin-bottom: -.5ex;
-    CompMore::after    content: "\2304" /* Unicode down arrowhead */
+    CompItem[selected]   background: yellow;
+    CompItem>*           padding: 0 .5ex;
+    CompIcon             width: 16px; min-width: 16px; display: inline-block; margin-right: .5ex;
+    CompIcon>img         max-width: 16px; max-height: 16px; vertical-align: middle;
+    CompResult           width: 45%; overflow: hidden;
+    CompDesc             color: gray; width: 50%;
+    CompLess             text-align: center; height: 0;    line-height: .5ex; padding-top: 1ex;
+    CompLess::after      content: "\2303" /* Unicode up arrowhead */
+    CompMore             text-align: center; height: .5ex; line-height: .5ex; margin-bottom: -.5ex;
+    CompMore::after      content: "\2304" /* Unicode down arrowhead */
 
     Gradient        height: 1px; margin-bottom: -1px; margin-top: -1px;
     GradientLeft    background-color: magenta;
@@ -73,10 +73,10 @@ Highlights.prototype.CSS = <![CDATA[
     LineNr      color: orange; background: white;
     Question    color: green; background: white; font-weight: bold;
 
-    StatusLine         color: white; background: black;
-    StatusLineBroken   color: black; background: #FFa0a0 /* light-red */
-    StatusLineSecure   color: black; background: #a0a0FF /* light-blue */
-    StatusLineExtended color: black; background: #a0FFa0 /* light-green */
+    StatusLine          color: white; background: black;
+    StatusLineBroken    color: black; background: #FFa0a0 /* light-red */
+    StatusLineSecure    color: black; background: #a0a0FF /* light-blue */
+    StatusLineExtended  color: black; background: #a0FFa0 /* light-green */
 
     TabClose,.tab-close-button
     TabIcon,.tab-icon
@@ -303,7 +303,7 @@ function Highlights(name, store)
      */
     this.loadCSS = function (css)
     {
-        css.replace(/^(\s*\S*\s+)\{((?:.|\n)*?)\}\s*$/gm, function (_, _1, _2) _1 + _2.replace(/\n\s*/g, " "))
+        css.replace(/^(\s*\S*\s+)\{((?:.|\n)*?)\}\s*$/gm, function (_, _1, _2) _1 + " " + _2.replace(/\n\s*/g, " "))
            .split("\n").filter(function (s) /\S/.test(s))
            .forEach(function (style)
         {