Key bindings; fix passkeys.

1 files changed, 9 insertions, 7 deletions

diff --git a/content_scripts/mode_passkeys.coffee b/content_scripts/mode_passkeys.coffee
index 631eb621..426e5369 100644
--- a/content_scripts/mode_passkeys.coffee
+++ b/content_scripts/mode_passkeys.coffee
@@ -1,6 +1,6 @@
 
 class PassKeysMode extends Mode
-  constructor: ->
+  constructor: (@normalMode) ->
     super
       name: "passkeys"
       trackState: true # Maintain @enabled, @passKeys and @keyQueue.
@@ -8,14 +8,16 @@ class PassKeysMode extends Mode
       keypress: (event) => @handleKeyChar event, String.fromCharCode event.charCode
       keyup: (event) => @handleKeyChar event, KeyboardUtils.getKeyChar event
 
-  # Keystrokes are *never* considered passKeys if the keyQueue is not empty.  So, for example, if 't' is a
-  # passKey, then 'gt' and '99t' will neverthless be handled by Vimium.
+  # Keystrokes are *never* considered passKeys if the user has begin entering a command.  So, for example, if
+  # 't' is a passKey, then 'gt' and '99t' will neverthless be handled by Vimium.
   handleKeyChar: (event, keyChar) ->
     return @continueBubbling if event.altKey or event.ctrlKey or event.metaKey
-    if keyChar and not @keyQueue and keyChar.length == 1 and 0 <= @passKeys.indexOf keyChar
-      @stopBubblingAndTrue
-    else
-      @continueBubbling
+    return @continueBubbling unless keyChar and keyChar.length == 1
+    # Test whether the user has already begun entering a command.
+    return @continueBubbling unless @normalMode.isFirstKeyChar keyChar
+    return @continueBubbling unless 0 <= @passKeys.indexOf keyChar
+    # This is a passkey.
+    @stopBubblingAndTrue
 
 root = exports ? window
 root.PassKeysMode = PassKeysMode