diff options
| author | Siri Hansen <[email protected]> | 2013-02-22 09:57:32 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-02-22 09:57:32 +0100 |
| commit | cd312a8ed8742705d3af46df09017619827b30e3 (patch) | |
| tree | b9a5be3fb34e2c7ebb4220b4535814889460cbbb /lib/reltool/src/reltool_app_win.erl | |
| parent | d1a7bed5b81aa619e09d951adbd947f680f76de6 (diff) | |
| parent | 9993bd517665aed42fd9ca8ac22001f3eced6170 (diff) | |
| download | otp-cd312a8ed8742705d3af46df09017619827b30e3.tar.gz otp-cd312a8ed8742705d3af46df09017619827b30e3.tar.bz2 otp-cd312a8ed8742705d3af46df09017619827b30e3.zip | |
Merge branch 'siri/reltool/unicode/OTP-10781'
* siri/reltool/unicode/OTP-10781:
[reltool] Improve stability of tests
[reltool] Make escript test work with hipe and smp
[reltool] Add unicode test
[reltool] Change ~s to ~ts and ~p to ~tp when appropriate
[reltool] Add unicode option to re:compile to allow unicode filenames
[reltool] Fix reconstruct source from debug_info to handle unicode
[reltool] Honour encoding in reltool_utils:prim_consult
Diffstat (limited to 'lib/reltool/src/reltool_app_win.erl')
| -rw-r--r-- | lib/reltool/src/reltool_app_win.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl index 6cd0d2f90b..81ab1687fb 100644 --- a/lib/reltool/src/reltool_app_win.erl +++ b/lib/reltool/src/reltool_app_win.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2012. All Rights Reserved. +%% Copyright Ericsson AB 2009-2013. 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 @@ -173,7 +173,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) -> S#state.mod_wins)}, ?MODULE:loop(S2); Msg -> - error_logger:format("~p~p got unexpected message:\n\t~p\n", + error_logger:format("~w~w got unexpected message:\n\t~p\n", [?MODULE, self(), Msg]), ?MODULE:loop(S) end. @@ -181,7 +181,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) -> exit_warning({'EXIT', _Pid, shutdown}) -> ok; exit_warning({'EXIT', _Pid, _Reason} = Msg) -> - error_logger:format("~p~p got unexpected message:\n\t~p\n", + error_logger:format("~w~w got unexpected message:\n\t~p\n", [?MODULE, self(), Msg]). create_window(#state{app = App} = S) -> @@ -627,7 +627,7 @@ handle_event(#state{sys = Sys, app = App} = S, Wx) -> Items = reltool_utils:get_items(ListCtrl), handle_mod_button(S, Items, Action); _ -> - error_logger:format("~p~p got unexpected app event from " + error_logger:format("~w~w got unexpected app event from " "wx:\n\t~p\n", [?MODULE, self(), Wx]), S @@ -674,8 +674,8 @@ move_mod(App, {_ItemNo, ModStr}, Action) -> blacklist_del -> undefined; _ -> - error_logger:format("~p~p got unexpected mod " - "button event: ~p\n\t ~p\n", + error_logger:format("~w~w got unexpected mod " + "button event: ~w\n\t ~p\n", [?MODULE, self(), ModName, Action]), M#mod.incl_cond end, |