Merge remote-tracking branch 'upstream/master' into 118_support_custom_keydown_handler

diff --cc src/xterm.js
index 16502e20a8b31127798fdd34e2a8ab4dd7e82a6c,39b4eb16316f83605c26fe1a6b5efa9699e2a99b..9afc08fd613895540246105769b00dc7af39615e
--- 1/src/xterm.js
--- 2/src/xterm.js
+++ b/src/xterm.js
@@@ -2548,9 -2655,10 +2668,14 @@@
       * @param {KeyboardEvent} ev The keydown event to be handled.
       */
      Terminal.prototype.keyDown = function(ev) {
 +      if (this.customKeydownHandler && this.customKeydownHandler(ev) === false) {
 +        return false;
 +      }
++
+       if (!this.compositionHelper.keydown.bind(this.compositionHelper)(ev)) {
+         return false;
+       }
+ 
        var self = this;
        var result = this.evaluateKeyEscapeSequence(ev);
  

diff --cc test/test.js
Simple merge