From 14d75364ebc230b4ac41a0547021586c0bce992f Mon Sep 17 00:00:00 2001
From: Jeff Principe <princjef@gmail.com>
Date: Thu, 9 Aug 2018 19:44:25 -0700
Subject: [PATCH 1/4] Stop typescript from emitting output files in typings
 test

---
 fixtures/typings-test/tsconfig.json | 3 ++-
 src/Terminal.integration.ts         | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fixtures/typings-test/tsconfig.json b/fixtures/typings-test/tsconfig.json
index 2dcff2ea..699a055a 100644
--- a/fixtures/typings-test/tsconfig.json
+++ b/fixtures/typings-test/tsconfig.json
@@ -4,6 +4,7 @@
   ],
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5"
+    "target": "es5",
+    "noEmit": true
   }
 }
diff --git a/src/Terminal.integration.ts b/src/Terminal.integration.ts
index f37d7840..ee38133b 100644
--- a/src/Terminal.integration.ts
+++ b/src/Terminal.integration.ts
@@ -163,7 +163,5 @@ describe('typings', () => {
     const fixtureDir = path.join(__dirname, '..', 'fixtures', 'typings-test');
     const result = cp.spawnSync(tsc, { cwd: fixtureDir });
     assert.equal(result.status, 0, `build did not succeed:\nstdout: ${result.stdout.toString()}\nstderr: ${result.stderr.toString()}\n`);
-    // Clean up
-    fs.unlinkSync(path.join(fixtureDir, 'typings-test.js'));
   });
 });

From 41fdc9071aa041bc9632d576f215b34b08f096f9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 10 Aug 2018 19:27:16 -0700
Subject: [PATCH 2/4] Update AUTHORS

---
 AUTHORS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 99f2bc59..482e0309 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -61,6 +61,7 @@ irokas <akasidiari@inf.uth.gr>
 Jakob Gillich <jakob@gillich.me>
 Jan Kuri <jkuri88@gmail.com>
 Jean Bruenn <himself@jeanbruenn.info>
+Jeff Principe <princjef@gmail.com>
 Jeremy Danyow <jedanyow@microsoft.com>
 Jianhui Zhao <jianhuizhao329@gmail.com>
 Joao Moreno <jomo@microsoft.com>
@@ -70,6 +71,7 @@ Jon Austin <jon.i.austin@gmail.com>
 Jon Kohler <jon@nutanix.com>
 Jon Masters <jon.masters@sky.com>
 Jörg Breitbart <jerch@rockborn.de>
+Jose Anton <roke22@gmail.com>
 jpoth <poth.john@gmail.com>
 Justin Luk <jluk@users.noreply.github.com>
 Justin Mecham <justin@mecham.me>
@@ -103,6 +105,7 @@ Peng Xiao <pengxiao@outlook.com>
 Peter Baumgarten <me@peterbaumgarten.com>
 Philip Olson <philip.olson@protonmail.ch>
 PowerHat <31401273+7PH@users.noreply.github.com>
+PowerHat <b.raymond@protonmail.com>
 pro-src <34285059+pro-src@users.noreply.github.com>
 pro-src <rodneyd.teal@gmail.com>
 Rick Baker <rick@ricktbaker.com>
@@ -111,6 +114,7 @@ Saad Malik <simfox3@gmail.com>
 Samuel Williams <samuel.williams@oriontransfer.co.nz>
 Saswat Das <saswatds@users.noreply.github.com>
 Saul Costa <saul@codevolve.com>
+Segev Finer <segev208@gmail.com>
 Shuanglei Tao <tsl0922@gmail.com>
 sitzmar <sitzmar@gmail.com>
 Steven Silvester <steven.silvester@ieee.org>

From 86800d2d7163c8eb9d7e9fe4d9a5a18f0aded179 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 10 Aug 2018 19:28:06 -0700
Subject: [PATCH 3/4] Bump version to 3.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d35405f..db566c68 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "main": "lib/public/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",

From 44366ffd3c46df3b01d20155c60156bc33fdec7f Mon Sep 17 00:00:00 2001
From: Niklas Higi <niklas@shroudedcode.com>
Date: Tue, 14 Aug 2018 12:29:12 +0200
Subject: [PATCH 4/4] Add support for the "Not italic" escape code

---
 src/InputHandler.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 0419c318..42b1b095 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1631,6 +1631,9 @@ export class InputHandler extends Disposable implements IInputHandler {
         // not bold nor faint
         flags &= ~FLAGS.BOLD;
         flags &= ~FLAGS.DIM;
+      } else if (p === 23) {
+        // not italic
+        flags &= ~FLAGS.ITALIC;
       } else if (p === 24) {
         // not underlined
         flags &= ~FLAGS.UNDERLINE;