Merge branch 'master' into harmony

2015-10-28 20:38:07 +01:00 · 2015-10-28 20:38:07 +01:00 · 392ac4ff31
commit 392ac4ff31
parent 64e7a00399 2a88d07b3a
2 changed files with 1 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,7 +1,6 @@
 language: node_js
 before_install: "npm install -g npm"
 node_js:
-    - "iojs"
    - "0.12"
    - "0.10"
    - "4"
--- a/lib/output.js
+++ b/lib/output.js
@ -95,7 +95,7 @@ function OutputStream(options) {
              case "\f": return "\\f";
              case "\n": return "\\n";
              case "\r": return "\\r";
-              case "\v": return "\\v";
+              case "\x0B": return output.option("screw_ie8") ? "\\v" : "\\x0B";
              case "\u2028": return "\\u2028";
              case "\u2029": return "\\u2029";
              case '"': ++dq; return '"';