Merge branch 'hb/stdlib/unicode_corrections/OTP-10820' into pan/unicode_printable_ranges

* hb/stdlib/unicode_corrections/OTP-10820:
  Fix some Unicode issues

Conflicts:
	lib/stdlib/test/shell_SUITE.erl

2 files changed, 16 insertions, 34 deletions

diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 06dae51cc9..7c7566e4ec 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -42,7 +42,7 @@
                 | {encoding, latin1 | unicode | utf8}).
 -type(options() :: hook_function() | [option()]).
 
--record(pp, {string_fun, char_fun, term_fun}).
+-record(pp, {string_fun, char_fun}).
 
 -record(options, {hook, encoding, opts}).
 
@@ -182,13 +182,11 @@ state(_Hook) ->
 
 state() ->
     #pp{string_fun = fun io_lib:write_string_as_latin1/1,
-        char_fun   = fun io_lib:write_char_as_latin1/1,
-        term_fun   = fun(T) -> io_lib:format("~p", [T]) end}.
+        char_fun   = fun io_lib:write_char_as_latin1/1}.
 
 unicode_state() ->
     #pp{string_fun = fun io_lib:write_string/1,
-        char_fun   = fun io_lib:write_char/1,
-        term_fun   = fun(T) -> io_lib:format("~tp", [T]) end}.
+        char_fun   = fun io_lib:write_char/1}.
 
 encoding(Options) ->
     case proplists:get_value(encoding, Options, epp:default_encoding()) of
@@ -204,10 +202,10 @@ lform({function,Line,Name,Arity,Clauses}, Opts, _State) ->
 lform({rule,Line,Name,Arity,Clauses}, Opts, _State) ->
     lrule({rule,Line,Name,Arity,Clauses}, Opts);
 %% These are specials to make it easier for the compiler.
-lform({error,E}, _Opts, State) ->
-    leaf((State#pp.term_fun)({error,E})++"\n");
-lform({warning,W}, _Opts, State) ->
-    leaf((State#pp.term_fun)({warning,W})++"\n");
+lform({error,E}, _Opts, _State) ->
+    leaf(format("~p\n", [{error,E}]));
+lform({warning,W}, _Opts, _State) ->
+    leaf(format("~p\n", [{warning,W}]));
 lform({eof,_Line}, _Opts, _State) ->
     $\n.
 
@@ -233,7 +231,7 @@ lattribute(import, Name, _Opts, _State) when is_list(Name) ->
 lattribute(import, {From,Falist}, _Opts, _State) ->
     attr("import",[{var,0,pname(From)},falist(Falist)]);
 lattribute(file, {Name,Line}, _Opts, State) ->
-    attr("file", [{var,0,(State#pp.term_fun)(Name)},{integer,0,Line}]);
+    attr("file", [{var,0,(State#pp.string_fun)(Name)},{integer,0,Line}]);
 lattribute(record, {Name,Is}, Opts, _State) ->
     Nl = leaf(format("-record(~w,", [Name])),
     [{first,Nl,record_fields(Is, Opts)},$)];
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index df66acb97b..c90b5ad5c8 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -129,7 +129,7 @@ start_restricted(RShMod) when is_atom(RShMod) ->
 	    error_logger:error_report(
 	      lists:flatten(
 		io_lib:fwrite(
-		  "Restricted shell module ~w not found: ~"++cs_p() ++"\n",
+		  "Restricted shell module ~w not found: ~tp\n",
 		  [RShMod,What]))),
 	    Error
     end.
@@ -214,8 +214,7 @@ server(StartSync) ->
             ok;
 	{RShMod2,What2} -> 
             io:fwrite(
-              ("Warning! Restricted shell module ~w not found: ~"
-               ++cs_p()++".\n"
+              ("Warning! Restricted shell module ~w not found: ~tp.\n"
                "Only the commands q() and init:stop() will be allowed!\n"),
               [RShMod2,What2]),
             application:set_env(stdlib, restricted_shell, ?MODULE)
@@ -337,7 +336,7 @@ get_prompt_func() ->
     end.
 
 bad_prompt_func(M) ->
-    fwrite_severity(benign, "Bad prompt function: ~"++cs_p(), [M]).
+    fwrite_severity(benign, "Bad prompt function: ~tp", [M]).
 
 default_prompt(N) ->
     %% Don't bother flattening the list irrespective of what the
@@ -571,7 +570,7 @@ report_exception(Class, Severity, {Reason,Stacktrace}, RT) ->
     I = iolist_size(Tag) + 1,
     PF = fun(Term, I1) -> pp(Term, I1, RT) end,
     SF = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
-    Enc = encoding(),
+    Enc = io:printable_range(),
     Str = lib:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
     io:requests([{put_chars, latin1, Tag},
                  {put_chars, unicode, Str},
@@ -1380,28 +1379,14 @@ pp(V, I, RT, Enc) ->
                              {record_print_fun, record_print_fun(RT)}]
                             ++ Enc)).
 
-%% Control sequence 'p' possibly with Unicode translation modifier
-cs_p() ->
-    case encoding() of
-        latin1 -> "p";
-        unicode -> "tp"
-    end.
-
 columns() ->
     case io:columns() of
         {ok,N} -> N;
         _ -> 80
     end.
 
-encoding() ->
-    [{encoding, Encoding}] = enc(),
-    Encoding.
-
 enc() ->
-    case lists:keyfind(encoding, 1, io:getopts()) of
-        false -> [{encoding,latin1}]; % should never happen
-        Enc -> [Enc]
-    end.
+    [{encoding, io:printable_range()}].
 
 garb(Shell) ->
     erlang:garbage_collect(Shell),
@@ -1424,10 +1409,9 @@ check_env(V) ->
 	{ok, Val} when is_integer(Val), Val >= 0 ->
 	    ok;
         {ok, Val} ->
-            Txt = io_lib:fwrite(
-                    ("Invalid value of STDLIB configuration parameter ~w: ~"
-                     ++cs_p()++"\n"),
-                    [V, Val]),
+            Txt = io_lib:fwrite
+                    ("Invalid value of STDLIB configuration parameter"
+                     "~w: ~tp\n", [V, Val]),
 	    error_logger:info_report(lists:flatten(Txt))
     end.