diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-24 16:49:01 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-24 16:49:01 -0700 |
| commit | 42af62f33adda57d8913768d939c1f4d0f8fe5a3 (patch) | |
| tree | 5de29663c8fb6468311944a1c712937873443e01 /lib/readline.js | |
| parent | 25dce6d62d20b51eb7d8049b71a4b436508e6209 (diff) | |
| parent | cfa03ad2e3423693f6bc56a82696f9c362d71ed0 (diff) | |
| download | nodejs-42af62f33adda57d8913768d939c1f4d0f8fe5a3.tar.gz nodejs-42af62f33adda57d8913768d939c1f4d0f8fe5a3.tar.bz2 nodejs-42af62f33adda57d8913768d939c1f4d0f8fe5a3.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
configure
deps/uv/ChangeLog
deps/uv/src/version.c
lib/tls.js
src/node_version.h
Diffstat (limited to 'lib/readline.js')
| -rw-r--r-- | lib/readline.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/readline.js b/lib/readline.js index e45fdeac7..1872e852b 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -981,7 +981,7 @@ function emitKey(stream, s) { key.name = 'space'; key.meta = (s.length === 2); - } else if (s <= '\x1a') { + } else if (s.length === 1 && s <= '\x1a') { // ctrl+letter key.name = String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1); key.ctrl = true; |