From e43d81730ef29083cc7f5b790df8d9901f7f5323 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 19 Oct 2011 22:38:35 -0400
Subject: [PATCH] Serialize :hi -link.

---
 common/modules/commands.jsm  | 4 ++++
 common/modules/highlight.jsm | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index 3c037cef..008945a0 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -836,8 +836,11 @@ var Commands = Module("commands", {
                                           .toObject();
 
         for (let [opt, val] in Iterator(args.options || {})) {
+            if (val === undefined)
+                continue;
             if (val != null && defaults[opt] === val)
                 continue;
+
             let chr = /^-.$/.test(opt) ? " " : "=";
             if (isArray(val))
                 opt += chr + Option.stringify.stringlist(val);
@@ -845,6 +848,7 @@ var Commands = Module("commands", {
                 opt += chr + Commands.quote(val);
             res.push(opt);
         }
+
         for (let [, arg] in Iterator(args.arguments || []))
             res.push(Commands.quote(arg));
 
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index 4d0bb2ae..ba935d3e 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -153,7 +153,7 @@ var Highlights = Module("Highlight", {
 
         let highlight = this.highlight[key] || this._create(false, [key]);
 
-        let bases = extend || highlight.extend;
+        let bases = extend || highlight.extends;
         if (append) {
             newStyle = Styles.append(highlight.value || "", newStyle);
             bases = highlight.extends.concat(bases);
@@ -405,7 +405,10 @@ var Highlights = Module("Highlight", {
                     {
                         command: this.name,
                         arguments: [v.class],
-                        literalArg: v.value
+                        literalArg: v.value,
+                        options: {
+                            "-link": v.extends.length ? v.extends : undefined
+                        }
                     }
                     for (v in Iterator(highlight))
                     if (v.value != v.defaultValue)