Hint mode improvements.

common/content/help.xsl

@@ -232,9 +232,13 @@
         <xsl:variable name="type" select="preceding-sibling::dactyl:type[1] | following-sibling::dactyl:type[1]"/>
         <span dactyl:highlight="HelpDefault">(default:<xsl:text> </xsl:text>
             <xsl:choose>
-                <xsl:when test="starts-with($type, 'string') or starts-with($type, 'regex')">
+                <xsl:when test="$type = 'string'">
                     <span dactyl:highlight="HelpString"><xsl:apply-templates mode="help-1"/></span>
                 </xsl:when>
+                <xsl:when test="contains($type, 'list') or contains($type, 'map')">
+                    <span dactyl:highlight="HelpString" delim=""><xsl:apply-templates mode="help-1"/></span>
+                    <xsl:if test=". = ''">(empty)</xsl:if>
+                </xsl:when>
                 <xsl:otherwise>
                     <span>
                         <xsl:attribute name="dactyl:highlight">

common/content/hints.js

@@ -72,7 +72,14 @@ const Hints = Module("hints", {
     _reset: function (slight) {
         if (!slight) {
             this.__reset();
+            this.prevInput = "";
+            this.escNumbers = false;
+            this._usedTabKey = false;
             this._canUpdate = false;
+            this._hintNumber = 0;
+            this._hintString = "";
+            statusline.updateInputBuffer("");
+            commandline.command = "";
         }
         this._pageHints = [];
         this._validHints = [];
@@ -83,13 +90,8 @@ const Hints = Module("hints", {
         this._activeTimeout = null;
     },
     __reset: function () {
-        statusline.updateInputBuffer("");
-        this._hintString = "";
-        this._hintNumber = 0;
-        this._usedTabKey = false;
-        this.prevInput = "";
-        this.escNumbers = false;
-        commandline.command = "";
+        if (!this._usedTabKey)
+            this._hintNumber = 0;
     },
 
     /**
@@ -478,7 +480,8 @@ const Hints = Module("hints", {
         let top = this._top;
         if (this._continue) {
             this.__reset();
-            this._showHints();
+            if (this._validHints.length <= 1)
+                this._showHints();
         }
         else {
             this._removeHints(timeout);
@@ -491,7 +494,8 @@ const Hints = Module("hints", {
             if ((modes.extended & modes.HINTS) && !this._continue)
                 modes.pop();
             commandline._lastEcho = null; // Hack.
-            this._hintMode.action(elem, elem.href || "", this._extendedhintCount, top);
+            this._hintMode.action(elem, elem.href || elem.src || "",
+                                  this._extendedhintCount, top);
         }, timeout);
         return true;
     },
@@ -1078,7 +1082,9 @@ const Hints = Module("hints", {
 
         options.add(["extendedhinttags", "eht"],
             "XPath string of hintable elements activated by ';'",
-            "regexmap", "[iI]:" + Option.quote(util.makeXPath(["img"])),
+            "regexmap", "[iI]:" + Option.quote(util.makeXPath(["img"])) +
+                       ",[OTivVWy]:" + Option.quote(util.makeXPath(
+                            ["{a,area}[@href]", "{img,iframe}[@src]"])),
             { validator: Option.validateXPath });
 
         options.add(["hinttags", "ht"],