Merge branch 'bjorn/fix-encoding/OTP-11041' into maint

* bjorn/fix-encoding/OTP-11041:
  Encode Erlang source files with non-ascii characters in UTF-8

11 files changed, 134 insertions, 125 deletions

diff --git a/lib/debugger/src/dbg_istk.erl b/lib/debugger/src/dbg_istk.erl
index c6922a80e4..ced42a5f9f 100644
--- a/lib/debugger/src/dbg_istk.erl
+++ b/lib/debugger/src/dbg_istk.erl
@@ -78,7 +78,7 @@ push(Bs, #ieval{level=Le,module=Mod,function=Name,
 pop() ->
     case get(trace_stack) of
 	false -> ignore;
-	_ -> % all ¦ no_tail
+	_ -> % all | no_tail
 	    case get(?STACK) of
 		[_Entry|Entries] ->
 		    put(?STACK, Entries);
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
index 8ec84d798f..7eb4c6ec97 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
+++ b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
@@ -1,3 +1,5 @@
+%%% -*- coding: utf-8 -*-
+%%%
 %%% Dialyzer was giving a warning with this input because of a bug in the
 %%% substitution of remote types in specs. Remote types in the first element of
 %%% a tuple would not update the tuple's tag set and we could end up with a
diff --git a/lib/kernel/test/global_SUITE_data/global_trace.erl b/lib/kernel/test/global_SUITE_data/global_trace.erl
index 4f253baac4..ddbe608c0a 100644
--- a/lib/kernel/test/global_SUITE_data/global_trace.erl
+++ b/lib/kernel/test/global_SUITE_data/global_trace.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -122,12 +123,12 @@ state(Else) ->
 %%%                              {ops,Ops}]
 %%%    NewKnown = Known ++ AddedNodes
 %%%    AddedNodes = NewNodes -- Known
-%%%    NewNodes �r h�r den man f�rhandlat med plus de noder den k�nner till.
+%%%    NewNodes är här den man förhandlat med plus de noder den känner till.
 %%% {added, AddedNodes}, Extra = [{ops,Ops}]
 %%%    NewKnown = Known ++ AddedNodes
-%%%    Den (passiva) noden f�r Nodes som �r NewNodes
-%%%    hos den f�rhandlande. Sedan: AddedNodes = (Nodes -- Known) -- [node()].
-%%%    Det �r som hos f�rhandlaren.
+%%%    Den (passiva) noden får Nodes som är NewNodes
+%%%    hos den förhandlande. Sedan: AddedNodes = (Nodes -- Known) -- [node()].
+%%%    Det är som hos förhandlaren.
 %%% {nodes_changed, {New,Old}}
 %%%    Every now and then the list [node() | nodes()] is checked for updates.
 %%%    New are the nodes that global does not know of (yet).
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index 95e288cd71..897cf2f350 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -354,13 +354,13 @@ gen_dsa2(LSize, NSize) ->
     X0 = prime(LSize),
     P0 = prime((LSize div 2) +1),
     
-    %% Choose L-bit prime modulus P such that p–1 is a multiple of q.
+    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
     case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
 	error -> 
 	    gen_dsa2(LSize, NSize);
 	P ->	    
 	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
-	    %%                 such that This may be done by setting g = h^(p–1)/q mod p, commonly h=2 is used.
+	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
 	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
 	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
diff --git a/lib/runtime_tools/src/ttb_autostart.erl b/lib/runtime_tools/src/ttb_autostart.erl
index 4c6971c119..5339507cec 100644
--- a/lib/runtime_tools/src/ttb_autostart.erl
+++ b/lib/runtime_tools/src/ttb_autostart.erl
@@ -1,3 +1,4 @@
+%%%-*- coding: utf-8 -*-
 %%%-------------------------------------------------------------------
 %%% File    : ttb_autostart.erl
 %%% Author  : Bartłomiej Puzoń <[email protected]>
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index 5b92e551a5..71aa985c4f 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -349,13 +349,13 @@ gen_dsa2(LSize, NSize) ->
     X0 = prime(LSize),
     P0 = prime((LSize div 2) +1),
     
-    %% Choose L-bit prime modulus P such that p–1 is a multiple of q.
+    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
     case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
 	error -> 
 	    gen_dsa2(LSize, NSize);
 	P ->	    
 	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
-	    %%                 such that This may be done by setting g = h^(p–1)/q mod p, commonly h=2 is used.
+	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
 	    
 	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
 	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 7ff4c81ea6..18ec17a4bf 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -992,7 +993,7 @@ otp_10622(Config) when is_list(Config) ->
           <<0>>),
     check(fun() -> <<"\x{aa}ff"/utf8>> = <<"\x{aa}ff"/utf8>> end,
           "<<\"\\x{aa}ff\"/utf8>> = <<\"\\x{aa}ff\"/utf8>>. ",
-          <<"�\xaaff">>),
+          <<"Â\xaaff">>),
     %% The same bug as last example:
     check(fun() -> case <<"foo"/utf8>> of
                        <<"foo"/utf8>> -> true
diff --git a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
index e0db132c47..b93b907392 100644
--- a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
+++ b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -515,7 +516,7 @@ create_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -523,16 +524,16 @@ create_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -541,19 +542,19 @@ create_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¥:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $þ:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $É:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -562,7 +563,7 @@ create_handle() ->
                              $<:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -570,16 +571,16 @@ create_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -588,22 +589,22 @@ create_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¥:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $::8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¡:8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ñ:8/integer-unit:1-unsigned-big,
                              $Y:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ª:8/integer-unit:1-unsigned-big,
                              $9:8/integer-unit:1-unsigned-big,
                              $\r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $ý:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -612,51 +613,51 @@ create_handle() ->
                              $I:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
+                             $²:8/integer-unit:1-unsigned-big,
+                             $Í:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
                              $\s:8/integer-unit:1-unsigned-big,
                              $>:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $£:8/integer-unit:1-unsigned-big,
                              $\023:8/integer-unit:1-unsigned-big,
                              $\210:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ç:8/integer-unit:1-unsigned-big,
                              $\232:8/integer-unit:1-unsigned-big,
                              $\226:8/integer-unit:1-unsigned-big,
                              $\223:8/integer-unit:1-unsigned-big,
                              $\237:8/integer-unit:1-unsigned-big,
                              $X:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $\235:8/integer-unit:1-unsigned-big,
                              $l:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¨:8/integer-unit:1-unsigned-big,
                              $g:8/integer-unit:1-unsigned-big,
                              $i:8/integer-unit:1-unsigned-big,
                              $d:8/integer-unit:1-unsigned-big,
                              $\200:8/integer-unit:1-unsigned-big,
                              $\001:8/integer-unit:1-unsigned-big,
                              $R:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
                              $\r:8/integer-unit:1-unsigned-big,
                              $\214:8/integer-unit:1-unsigned-big,
                              $\030:8/integer-unit:1-unsigned-big,
@@ -664,7 +665,7 @@ create_handle() ->
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $c:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\017:8/integer-unit:1-unsigned-big,
                              $=:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
@@ -708,24 +709,24 @@ create_handle() ->
                              $*:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
                              $\005:8/integer-unit:1-unsigned-big,
                              $R:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
                              $\031:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
@@ -737,7 +738,7 @@ create_handle() ->
                              $/:8/integer-unit:1-unsigned-big,
                              $\022:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\205:8/integer-unit:1-unsigned-big,
                              $\t:8/integer-unit:1-unsigned-big,
                              $\216:8/integer-unit:1-unsigned-big>>,
@@ -749,33 +750,33 @@ create_handle() ->
                              $j:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $+:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ú:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $·:8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $æ:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $\202:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ô:8/integer-unit:1-unsigned-big,
                              $D:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $®:8/integer-unit:1-unsigned-big,
                              $\034:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
@@ -791,7 +792,7 @@ create_handle() ->
                              $W:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $£:8/integer-unit:1-unsigned-big,
                              $\023:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
@@ -800,18 +801,18 @@ create_handle() ->
                              $\027:8/integer-unit:1-unsigned-big,
                              $\237:8/integer-unit:1-unsigned-big,
                              $\205:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¤:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\007:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¤:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\021:8/integer-unit:1-unsigned-big,
                              $.:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
                              $\224:8/integer-unit:1-unsigned-big,
                              $\217:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\002:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\203:8/integer-unit:1-unsigned-big,
@@ -1398,7 +1399,7 @@ lookup_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -1406,16 +1407,16 @@ lookup_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -1424,19 +1425,19 @@ lookup_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¦:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\206:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $Þ:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -1445,7 +1446,7 @@ lookup_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -1453,16 +1454,16 @@ lookup_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -1471,19 +1472,19 @@ lookup_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¦:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
+                             $â:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $ä:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $h:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
@@ -1525,25 +1526,25 @@ lookup_handle() ->
                              $+:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
+                             $²:8/integer-unit:1-unsigned-big,
+                             $Í:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
@@ -1555,10 +1556,10 @@ lookup_handle() ->
                              $/:8/integer-unit:1-unsigned-big,
                              $\022:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $×:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\t:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $Û:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -1567,33 +1568,33 @@ lookup_handle() ->
                              $\\:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $+:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ú:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $û:8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $æ:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $\202:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ô:8/integer-unit:1-unsigned-big,
                              $D:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Á:8/integer-unit:1-unsigned-big,
                              $\034:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
@@ -1605,7 +1606,7 @@ lookup_handle() ->
                              $Y:8/integer-unit:1-unsigned-big,
                              $b:8/integer-unit:1-unsigned-big,
                              $Q:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¢:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
@@ -1616,7 +1617,7 @@ lookup_handle() ->
                              $>:8/integer-unit:1-unsigned-big,
                              $\v:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
                              $\020:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
                              $5:8/integer-unit:1-unsigned-big,
@@ -1630,7 +1631,7 @@ lookup_handle() ->
                              $\005:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ù:8/integer-unit:1-unsigned-big,
                              $\031:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big>>}
                    end,
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 681c154463..3c49aaa103 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -2820,7 +2821,7 @@ otp_10302(Config) when is_list(Config) ->
     
     "ok.\n** exception error: an error occurred when evaluating"
         " an arithmetic expression\n     in operator  '/'/2\n"
-        "        called as <<\"�\">> / <<\"�\">>.\n" = t({Node,Test7}),
+        "        called as <<\"ª\">> / <<\"ª\">>.\n" = t({Node,Test7}),
     Test8 =
         <<"begin
                A = [1089],
diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 5584c1e50c..d0f40c47a7 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -214,7 +215,7 @@ html_encoding(utf8) ->
 %%% from the source.
 %%%
 %%% Example: if the encoding of the file is utf8, and we have a string
-%%% containing "�" = [229], then we need to convert this to [195,165]
+%%% containing "å" = [229], then we need to convert this to [195,165]
 %%% before writing. Note that this conversion is only necessary
 %%% because the destination file is not (necessarily) opened with utf8
 %%% encoding - it is opened with default encoding in order to allow
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 3db2f5f9f1..8ad5fcfb5c 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -187,7 +188,7 @@ test_server_unicode(Config) ->
     %% Create and run two test suites - one with filename and content
     %% in latin1 (if the default filename mode is latin1) and one with
     %% filename and content in utf8.  Both have name and content
-    %% including letters ���.  Check that all logs are generated with
+    %% including letters äöå.  Check that all logs are generated with
     %% utf8 encoded filenames.
     case file:native_name_encoding() of
 	utf8 ->
@@ -348,7 +349,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
     SuiteHtml = translate_filename(LowerModStr++".src.html",Encoding),
     true = filelib:is_regular(filename:join(RunDir,SuiteHtml)),
 
-    TCLog = translate_filename(LowerModStr++".tc_���.html",Encoding),
+    TCLog = translate_filename(LowerModStr++".tc_äöå.html",Encoding),
     true = filelib:is_regular(filename:join(RunDir,TCLog)),
     ok.
 
@@ -370,7 +371,7 @@ start_node(Config,Name,Args) ->
     end.
 
 create_unicode_test_suite(Dir,Encoding) ->
-    ModStr = "test_server_"++atom_to_list(Encoding)++"_���_SUITE",
+    ModStr = "test_server_"++atom_to_list(Encoding)++"_äöå_SUITE",
     File = filename:join(Dir,ModStr++".erl"),
     Suite =
 	["%% -*- ",epp:encoding_to_string(Encoding)," -*-\n",
@@ -378,12 +379,12 @@ create_unicode_test_suite(Dir,Encoding) ->
 	 "\n"
 	 "-export([all/1, init_per_suite/1, end_per_suite/1]).\n"
 	 "-export([init_per_testcase/2, end_per_testcase/2]).\n"
-	 "-export([tc_���/1]).\n"
+	 "-export([tc_äöå/1]).\n"
 	 "\n"
 	 "-include_lib(\"test_server/include/test_server.hrl\").\n"
 	 "\n"
 	 "all(suite) ->\n"
-	 "    [tc_���].\n"
+	 "    [tc_äöå].\n"
 	 "\n"
 	 "init_per_suite(Config) ->\n"
 	 "    Config.\n"
@@ -406,7 +407,7 @@ create_unicode_test_suite(Dir,Encoding) ->
 	 "    ?t:timetrap_cancel(Dog),\n"
 	 "    ok.\n"
 	 "\n"
-	 "tc_���(Config) when is_list(Config) ->\n"
+	 "tc_äöå(Config) when is_list(Config) ->\n"
 	 "    true = filelib:is_dir(?config(priv_dir,Config)),\n"
 	 "    ok.\n"],
     {ok,Fd} = file:open(raw_filename(File,Encoding),[write,{encoding,Encoding}]),