Merge branch 'hb/unicode/OTP-10302'

OTP-10742
OTP-10745
OTP-10749

* hb/unicode/OTP-10302:
  [stdlib] Remove documentation of ~tp
  Remove one use of iolist_size/1 in io_lib_pretty.erl
  Add a new function proc_lib:format/2 which takes encoding
  Export the type erl_scan:token()
  Make adjustments for Unicode
  [stdlib] Change default of erl_scan's unicode option
  Update preloaded
  Correct recently introduced Unicode related type errors
  [stdlib] Introduce new functions epp:read_encoding_from_binary/1,2
  Extend char() to Unicode characters
  [kernel] Correct bugs in the old shell (user.erl)
  [parsetools] Change the encoding of test suites to UTF-8
  [stdlib] Fix a contract bug
  [stdlib] Update the Unicode examples in STDLIB User's Guide
  [stdlib] Remove documentation of Unicode functions in io_lib

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index 4c1c0f904b..7ef2334106 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -122,7 +122,7 @@ machine_load(Mod, File, Opts) ->
 		    code:purge(Mod),
 		    check_load(code:load_abs(File2,Mod), Mod);
 		_OtherMod ->
-		    format("** Module name '~p' does not match file name '~p' **~n",
+		    format("** Module name '~p' does not match file name '~tp' **~n",
 			   [Mod,File]),
 		    {error, badfile}
 	    end;
@@ -203,11 +203,11 @@ make_term(Str) ->
 	    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
 		{ok, Term} -> Term;
 		{error, {_,_,Reason}} ->
-		    io:format("~s: ~s~n", [Reason, Str]),
+		    io:format("~ts: ~ts~n", [Reason, Str]),
 		    throw(error)
 	    end;
 	{error, {_,_,Reason}, _} ->
-	    io:format("~s: ~s~n", [Reason, Str]),
+	    io:format("~ts: ~ts~n", [Reason, Str]),
 	    throw(error)
     end.
 
@@ -475,11 +475,11 @@ f_p_e(P, F) ->
 	{error, enoent} = Enoent ->
 	    Enoent;
 	{error, E={Line, _Mod, _Term}} ->
-	    error("file:path_eval(~p,~p): error on line ~p: ~s~n",
+	    error("file:path_eval(~tp,~tp): error on line ~p: ~ts~n",
 		  [P, F, Line, file:format_error(E)]),
 	    ok;
 	{error, E} ->
-	    error("file:path_eval(~p,~p): ~s~n",
+	    error("file:path_eval(~tp,~tp): ~ts~n",
 		  [P, F, file:format_error(E)]),
 	    ok;
 	Other ->
@@ -588,7 +588,12 @@ month(12) -> "December".
 flush() ->
     receive
 	X ->
-	    format("Shell got ~p~n",[X]),
+            case lists:keyfind(encoding, 1, io:getopts()) of
+                {encoding,unicode} ->
+                    format("Shell got ~tp~n",[X]);
+                _ ->
+                    format("Shell got ~p~n",[X])
+            end,
 	    flush()
     after 0 ->
 	    ok