aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-05-08 15:02:17 +0200
committerBjörn Gustavsson <[email protected]>2014-05-08 15:02:17 +0200
commite65c7bf107ecb07baa37bc15b83ad70392eae25b (patch)
tree458e3301c8a477ef9d211a5a3f3efb7a674ef0b1
parent2ecf72ae4e0ca3a447a6b5b04115a4e436931d22 (diff)
parent338698874e1f57a38c469e6e5b876d12ee14a0fb (diff)
downloadotp-e65c7bf107ecb07baa37bc15b83ad70392eae25b.tar.gz
otp-e65c7bf107ecb07baa37bc15b83ad70392eae25b.tar.bz2
otp-e65c7bf107ecb07baa37bc15b83ad70392eae25b.zip
Merge branch 'bjorn/erts/fix-eval/OTP-11916' into maint
* bjorn/erts/fix-eval/OTP-11916: The encoding for '-eval Program' should be UTF-8
-rw-r--r--erts/preloaded/ebin/init.beambin48796 -> 48780 bytes
-rw-r--r--erts/preloaded/src/init.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 7f2d2740e1..26f779500c 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index ab8464956c..e95e11b3e6 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -1041,7 +1041,7 @@ start_em([]) -> ok.
start_it([]) ->
ok;
start_it({eval,Bin}) ->
- Str = binary_to_list(Bin),
+ Str = b2s(Bin),
{ok,Ts,_} = erl_scan:string(Str),
Ts1 = case reverse(Ts) of
[{dot,_}|_] -> Ts;