diff options
| author | Björn Gustavsson <[email protected]> | 2014-05-08 15:21:06 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-05-08 15:21:06 +0200 |
| commit | f1a84dbba9f6acfd31ab82c5da4468d36d5a04db (patch) | |
| tree | 72764093d9d358fbf4cccdf88a116d6451e19840 /erts | |
| parent | 21e5f732765606a465ab4f2938664a64b71d0e48 (diff) | |
| parent | e65c7bf107ecb07baa37bc15b83ad70392eae25b (diff) | |
| download | otp-f1a84dbba9f6acfd31ab82c5da4468d36d5a04db.tar.gz otp-f1a84dbba9f6acfd31ab82c5da4468d36d5a04db.tar.bz2 otp-f1a84dbba9f6acfd31ab82c5da4468d36d5a04db.zip | |
Merge branch 'maint'
* maint:
The encoding for '-eval Program' should be UTF-8
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 48796 -> 48780 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex 7f2d2740e1..26f779500c 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam 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; |