Merge branch 'hb/prepare_for_unicode/OTP-10630'

* hb/prepare_for_unicode/OTP-10630:
  Prepare OTP files for Unicode as default encoding

5 files changed, 18 insertions, 18 deletions

diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 2e88c35741..5e5948c965 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1248,7 +1248,7 @@ if_clauses([], Bs, Ieval) ->
     exception(error, if_clause, Bs, Ieval).
 
 %% case_clauses(Value, Clauses, Bindings, Error, Ieval)
-%%   Error = try_clause � case_clause
+%%   Error = try_clause | case_clause
 case_clauses(Val, [{clause,_,[P],G,B}|Cs], Bs0, Error, Ieval) ->
     case match(P, Val, Bs0) of
 	{match,Bs} ->
diff --git a/lib/debugger/src/dbg_ui_trace.erl b/lib/debugger/src/dbg_ui_trace.erl
index d318987f60..8017069c50 100644
--- a/lib/debugger/src/dbg_ui_trace.erl
+++ b/lib/debugger/src/dbg_ui_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,10 +31,10 @@
 
 		pid,           % pid() Debugged process
 		meta,          % pid() Meta process
-		status,        % {Status,Mod,Line} � {exit,Where,Reason}
-		               %   Status = init � idle | break
-		               %      | wait_break � wait_running
-		               %      � running
+		status,        % {Status,Mod,Line} | {exit,Where,Reason}
+		               %   Status = init | idle | break
+		               %      | wait_break | wait_running
+		               %      | running
                                % Where={Mod,Line} | null
 
 		cm,            % atom() | undefined Current module
@@ -718,7 +718,7 @@ menus() ->
 
 %% enable(Status) -> [MenuItem]
 %%   Status = init  % when first message from Meta has arrived
-%%          | idle | break | exit | wait_break � wait_running | running
+%%          | idle | break | exit | wait_break | wait_running | running
 enable(init) -> [];
 enable(idle) -> ['Stop','Kill'];
 enable(break) -> ['Step','Next','Continue','Finish','Skip',
diff --git a/lib/debugger/src/dbg_ui_trace_win.erl b/lib/debugger/src/dbg_ui_trace_win.erl
index 1b439cbf18..beb3fbd71e 100644
--- a/lib/debugger/src/dbg_ui_trace_win.erl
+++ b/lib/debugger/src/dbg_ui_trace_win.erl
@@ -418,8 +418,8 @@ clear_breaks(WinInfo, Mod) ->
 %%--------------------------------------------------------------------
 %% display(Arg)
 %%   Arg = idle | {Status,Mod,Line} | {running,Mod}
-%%       � {exit,Where,Reason} | {text,Text}
-%%     Status = break | wait � Level
+%%       | {exit,Where,Reason} | {text,Text}
+%%     Status = break | wait | Level
 %%       Level = int()
 %%     Mod = atom()
 %%     Line = integer()
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index 2fdf39ba5a..f61df93aec 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -32,10 +32,10 @@
 
 		pid,           % pid() Debugged process
 		meta,          % pid() Meta process
-		status,        % {Status,Mod,Line} � {exit,Where,Reason}
-		               %   Status = init � idle | break
-		               %      | wait_break � wait_running
-		               %      � running
+		status,        % {Status,Mod,Line} | {exit,Where,Reason}
+		               %   Status = init | idle | break
+		               %      | wait_break | wait_running
+		               %      | running
                                % Where={Mod,Line} | null
 
 		cm,            % atom() | undefined Current module
@@ -740,7 +740,7 @@ menus() ->
 
 %% enable(Status) -> [MenuItem]
 %%   Status = init  % when first message from Meta has arrived
-%%          | idle | break | exit | wait_break � wait_running | running
+%%          | idle | break | exit | wait_break | wait_running | running
 enable(init) -> [];
 enable(idle) -> ['Stop','Kill'];
 enable(break) -> ['Step','Next','Continue','Finish','Skip',
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 68e8e0b844..40d110f071 100644
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -431,8 +431,8 @@ clear_breaks(WinInfo, Mod) ->
 %%--------------------------------------------------------------------
 %% display(Arg)
 %%   Arg = idle | {Status,Mod,Line} | {running,Mod}
-%%       � {exit,Where,Reason} | {text,Text}
-%%     Status = break | wait � Level
+%%       | {exit,Where,Reason} | {text,Text}
+%%     Status = break | wait | Level
 %%       Level = int()
 %%     Mod = atom()
 %%     Line = integer()