aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2016-09-09 13:57:12 +0100
committerGitHub2016-09-09 13:57:12 +0100
commit7a954b7b51b791ccf9a4d76370bf6275506e038a (patch)
treefc5428d4254782d627b6836634bc715238b3f9c9
parentaa178b03ea1e4d12071751b81be9237428e5a97e (diff)
parent408f85b04e2cb69dcb08d1c4dfa306e555239d07 (diff)
downloadvimium-7a954b7b51b791ccf9a4d76370bf6275506e038a.tar.bz2
Merge pull request #2215 from colin-kiegel/colin-kiegel-partly-fix-986
Consider the alt-key status when trying to detect <c-[>
-rw-r--r--lib/keyboard_utils.coffee3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee
index f997b455..9c694826 100644
--- a/lib/keyboard_utils.coffee
+++ b/lib/keyboard_utils.coffee
@@ -75,7 +75,8 @@ KeyboardUtils =
isEscape: (event) ->
# c-[ is mapped to ESC in Vim by default.
- (event.keyCode == @keyCodes.ESC) || (event.ctrlKey && @getKeyChar(event) == '[' and not event.metaKey)
+ (event.keyCode == @keyCodes.ESC) ||
+ (event.ctrlKey && @getKeyChar(event) == '[' and not event.metaKey and not event.altKey)
# TODO. This is probably a poor way of detecting printable characters. However, it shouldn't incorrectly
# identify any of chrome's own keyboard shortcuts as printable.