disable `hoist_funs` by default (#2626)

4 files changed, 5 insertions, 5 deletions

diff --git a/README.md b/README.md
index ef496178..43793dcd 100644
--- a/README.md
+++ b/README.md
@@ -627,7 +627,7 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `global_defs` (default: `{}`) -- see [conditional compilation](#conditional-compilation)
 
-- `hoist_funs` (default: `true`) -- hoist function declarations
+- `hoist_funs` (default: `false`) -- hoist function declarations
 
 - `hoist_props` (default: `true`) -- hoist properties from constant object and
   array literals into regular variables subject to a set of constraints. For example:
diff --git a/lib/compress.js b/lib/compress.js
index 5aacfd73..3410b5a7 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -58,7 +58,7 @@ function Compressor(options, false_by_default) {
         evaluate      : !false_by_default,
         expression    : false,
         global_defs   : {},
-        hoist_funs    : !false_by_default,
+        hoist_funs    : false,
         hoist_props   : !false_by_default,
         hoist_vars    : false,
         ie8           : false,
diff --git a/test/mocha/glob.js b/test/mocha/glob.js
index b6f1e049..58c40cf0 100644
--- a/test/mocha/glob.js
+++ b/test/mocha/glob.js
@@ -11,7 +11,7 @@ describe("bin/uglifyjs with input file globs", function() {
         exec(command, function(err, stdout) {
             if (err) throw err;
 
-            assert.strictEqual(stdout, 'function foo(o){print("Foo:",2*o)}var print=console.log.bind(console);\n');
+            assert.strictEqual(stdout, 'var print=console.log.bind(console);function foo(o){print("Foo:",2*o)}\n');
             done();
         });
     });
diff --git a/test/mocha/minify.js b/test/mocha/minify.js
index 157d6515..5d9512f3 100644
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -43,7 +43,7 @@ describe("minify", function() {
             compressed += result.code;
         });
         assert.strictEqual(JSON.stringify(cache).slice(0, 20), '{"cname":5,"props":{');
-        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}function c(o){l("Foo:",2*o)}var l=console.log.bind(console);var f=n(3),i=r(12);l("qux",f,i),c(11);');
+        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}var c=console.log.bind(console);function l(o){c("Foo:",2*o)}var f=n(3),i=r(12);c("qux",f,i),l(11);');
         assert.strictEqual(run_code(compressed), run_code(original));
     });
 
@@ -69,7 +69,7 @@ describe("minify", function() {
             compressed += result.code;
         });
         assert.strictEqual(JSON.stringify(cache).slice(0, 28), '{"vars":{"cname":5,"props":{');
-        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}function c(o){l("Foo:",2*o)}var l=console.log.bind(console);var f=n(3),i=r(12);l("qux",f,i),c(11);');
+        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}var c=console.log.bind(console);function l(o){c("Foo:",2*o)}var f=n(3),i=r(12);c("qux",f,i),l(11);');
         assert.strictEqual(run_code(compressed), run_code(original));
     });