From e179767da93fe47969b86c1f4872df2487204f8f Mon Sep 17 00:00:00 2001
From: Anton Khodakivskiy <akhodakivskiy@gmail.com>
Date: Wed, 12 Jun 2013 14:20:41 +0300
Subject: [PATCH] Closes #110. Use default hint chars if custom hint chars
 string is empty

---
 extension/packages/marker.coffee | 6 ++++--
 extension/packages/prefs.coffee  | 5 ++++-
 extension/packages/vim.coffee    | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/extension/packages/marker.coffee b/extension/packages/marker.coffee
index fae7ff9..4911403 100644
--- a/extension/packages/marker.coffee
+++ b/extension/packages/marker.coffee
@@ -1,7 +1,9 @@
 { interfaces: Ci }      = Components
 XPathResult             = Ci.nsIDOMXPathResult
 
-{ getPref } = require 'prefs'
+{ getPref
+, getDefaultPref
+} = require 'prefs'
 
 # All elements that have one or more of the following properties 
 # qualify for their own marker in hints mode
@@ -106,7 +108,7 @@ class Marker
 #
 # The array of markers is returned
 Marker.createMarkers = (document, startIndex) ->
-  hintChars = getPref('hint_chars').toLowerCase()
+  hintChars = getPref('hint_chars').toLowerCase() or getDefaultPref('hint_chars')
 
   set = getMarkableElements(document)
   markers = [];
diff --git a/extension/packages/prefs.coffee b/extension/packages/prefs.coffee
index 9d868b1..4ee1610 100644
--- a/extension/packages/prefs.coffee
+++ b/extension/packages/prefs.coffee
@@ -35,7 +35,9 @@ getPref = do ->
   
   return (key, defaultValue=undefined) ->
     value = getBranchPref branch, key, defaultValue
-    return if value == undefined then DEFAULT_PREF_VALUES[key] else value
+    return if value == undefined then getDefaultPref(key) else value
+
+getDefaultPref = (key) -> return DEFAULT_PREF_VALUES[key]
 
 getFirefoxPref = do ->
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
@@ -98,6 +100,7 @@ isCommandDisabled = (key) ->
   return false
 
 exports.getPref                   = getPref
+exports.getDefaultPref            = getDefaultPref
 exports.getFirefoxPref            = getFirefoxPref
 exports.setPref                   = setPref
 exports.isCommandDisabled         = isCommandDisabled
diff --git a/extension/packages/vim.coffee b/extension/packages/vim.coffee
index 04f27d8..93771a9 100644
--- a/extension/packages/vim.coffee
+++ b/extension/packages/vim.coffee
@@ -5,6 +5,7 @@ utils = require 'utils'
 } = require 'commands'
 
 { getPref
+, getDefaultPref
 , isCommandDisabled 
 } = require 'prefs'
 
@@ -36,7 +37,7 @@ class Vim
       result = maybeCommand @keys.concat([keyStr])
     else if !keyboardEvent.ctrlKey and !keyboardEvent.metaKey
       if @mode == MODE_HINTS
-        hintChars = getPref('hint_chars').toLowerCase()
+        hintChars = getPref('hint_chars').toLowerCase() or getDefaultPref('hint_chars')
         result = hintChars.search(regexpEscape(keyStr)) > -1
 
     if result 
-- 
2.39.3