From 308f1b86dc8045dedbe882be2de049f17b0cf2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
Date: Sun, 13 Mar 2011 09:04:25 +0100
Subject: [PATCH] Fix dactyl:link topic attribute URI scheme matching
 conflicting with :excmds.

---
 common/content/help.xsl            | 4 ++--
 pentadactyl/locale/en-US/intro.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/content/help.xsl b/common/content/help.xsl
index e70875bc..3dcdf215 100644
--- a/common/content/help.xsl
+++ b/common/content/help.xsl
@@ -378,14 +378,14 @@
         <a>
             <xsl:choose>
                 <xsl:when test="not(@topic)"/>
-                <xsl:when test="regexp:match(@topic, '^([a-zA-Z]*:|[^/]*#|/)', '')">
+                <xsl:when test="regexp:match(@topic, '^([a-zA-Z]+:|[^/]*#|/)', '')">
                     <xsl:attribute name="href"><xsl:value-of select="@topic"/></xsl:attribute>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:attribute name="href"><xsl:value-of select="concat('dactyl://help-tag/', @topic)"/></xsl:attribute>
                 </xsl:otherwise>
             </xsl:choose>
-            <xsl:if test="regexp:match(@topic, '^[a-zA-Z]*:', '')
+            <xsl:if test="regexp:match(@topic, '^[a-zA-Z]+:', '')
                     and not(starts-with(@topic, 'mailto:') or
                             starts-with(@topic, 'chrome:') or
                             starts-with(@topic, 'resource:') or
diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml
index bc8bd7fd..2061c0e3 100644
--- a/pentadactyl/locale/en-US/intro.xml
+++ b/pentadactyl/locale/en-US/intro.xml
@@ -134,7 +134,7 @@
     <li>Quick and powerful <link topic="hints">keyboard navigation</link> for links, input fields, etc.</li>
     <li>Vim-like <link topic="status-line">status line</link></li>
     <li>Keyboard <t>macros</t>, along with custom key mappings and commands</li>
-    <li>Minimal GUI, along with commands to <link href=":toolbarhide">hide</link> and <link href=":toolbartoggle">toggle</link> toolbars and menus</li>
+    <li>Minimal GUI, along with commands to <link topic=":toolbarhide">hide</link> and <link topic=":toolbartoggle">toggle</link> toolbars and menus</li>
     <li>Ability to <ex>:source</ex> JavaScript, CSS, and &dactyl.appName; command files</li>
     <li>Ability to <link topic="marks">mark</link> the current page position and return to it</li>
     <li>Count support for many commands (<tt>3</tt><k name="C-o"/> will go back <tt>3</tt> pages)</li>