Merge branch 'dgud/misc-cleanup'

* dgud/misc-cleanup:
  dbg: Remove debug printouts and fix file dialog
  sasl: Fix testcase which didn't work on windows
  gs: Minor doc fix, gs is deprecated

7 files changed, 39 insertions, 35 deletions

diff --git a/lib/debugger/src/dbg_wx_filedialog_win.erl b/lib/debugger/src/dbg_wx_filedialog_win.erl
index c8ecb7b5d4..ea34295067 100644
--- a/lib/debugger/src/dbg_wx_filedialog_win.erl
+++ b/lib/debugger/src/dbg_wx_filedialog_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. 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
@@ -242,16 +242,13 @@ handle_event(#wx{event=#wxList{itemIndex=Index}},
 	    {noreply, State0}
     end;
 
-handle_event(#wx{event=#wxCommand{type=command_text_updated, cmdString=Wanted}}, 
+handle_event(#wx{event=#wxCommand{type=command_text_updated, cmdString=Wanted}},
 	     State = #state{ptext=Previous, completion=Comp}) ->
     case Previous =:= undefined orelse lists:prefix(Wanted, Previous) of
-	true -> 
-	    case Comp of
-		{Temp,_} -> wxWindow:destroy(Temp);
-		undefined -> ok
-	    end,
+	true ->
+	    destroy_completion(Comp),
 	    {noreply, State#state{ptext=Wanted,completion=undefined}};
-	false -> 
+	false ->
 	    {noreply, show_completion(Wanted, State)}
     end;
 
@@ -310,8 +307,7 @@ handle_event(#wx{event=#wxSize{size={Width,_}}}, State = #state{list=LC}) ->
 	     end),
     {noreply, State};
 	
-handle_event(Event,State) ->
-    io:format("~p Got ~p ~n",[self(), Event]),
+handle_event(_Event,State) ->
     {noreply, State}.
 
 handle_info(_Msg, State) ->
@@ -419,8 +415,9 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
     end.
 
 destroy_completion(undefined) -> ok;
-destroy_completion({Window, _}) ->
+destroy_completion({Window, _LB}) ->
     Parent = wxWindow:getParent(Window),
+    wxWindow:hide(Window),
     wxWindow:destroy(Window),
     wxWindow:refresh(Parent).
 
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 4a01492cf5..4ab03985d3 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -148,7 +148,7 @@ init2(CallingPid, Mode, SFile, GS) ->
 
 		    win     = Win,
 		    focus   = undefined,
-		    coords  = {20,20},
+		    coords  = {-1,-1},
 
 		    intdir  = element(2, file:get_cwd()),
 		    pinfos  = [],
diff --git a/lib/debugger/src/dbg_wx_mon_win.erl b/lib/debugger/src/dbg_wx_mon_win.erl
index 0071b27027..d94eb14937 100644
--- a/lib/debugger/src/dbg_wx_mon_win.erl
+++ b/lib/debugger/src/dbg_wx_mon_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -617,8 +617,6 @@ handle_event(#wx{userData=Data,
 	     _WinInfo) ->
     Data;
 handle_event(_Event, _WinInfo) ->
-%% FIXME
-    io:format("Ev: ~p~n",[_Event]),
     ignore.
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index 1ac796bb4c..4438466bb0 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -125,7 +125,7 @@ init(Pid, Parent, Meta, TraceWin, BackTrace, Strings) ->
     dbg_wx_winman:insert(Title, Window),
 
     %% Initial process state
-    State1 = #state{win=Win, coords={0,0}, pid=Pid, meta=Meta,
+    State1 = #state{win=Win, coords={-1,-1}, pid=Pid, meta=Meta,
 		    status={idle,null,null},
 		    stack={1,1}, strings=[str_on]},
 
diff --git a/lib/debugger/src/dbg_wx_view.erl b/lib/debugger/src/dbg_wx_view.erl
index 6242b9d0e0..fc7ffc0d56 100644
--- a/lib/debugger/src/dbg_wx_view.erl
+++ b/lib/debugger/src/dbg_wx_view.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -72,7 +72,7 @@ init(GS, Env, Mod, Title) ->
 		    Win2,
 		    int:all_breaks(Mod)),
     
-    try loop(#state{gs=GS, win=Win3, coords={0,0}, mod=Mod}) 
+    try loop(#state{gs=GS, win=Win3, coords={-1,-1}, mod=Mod})
     catch _E:normal ->
 	    exit(normal);
 	  _E:_R ->
diff --git a/lib/gs/doc/src/gs.xml b/lib/gs/doc/src/gs.xml
index e0d7fb20da..7b589d002d 100644
--- a/lib/gs/doc/src/gs.xml
+++ b/lib/gs/doc/src/gs.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2000</year>
-      <year>2013</year>
+      <year>2014</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -39,7 +39,7 @@
 	graphical user interface.
       </p>
       <p>
-	GS is deprecated and will be removed in the R16 release.
+	GS is deprecated and will be removed in the 18.0 release.
       </p>
     </warning>
     <p>The Graphics System, GS, is easy to learn and
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 7e9d7c984a..ad2a8005b9 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. 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
@@ -1781,37 +1781,46 @@ otp_10463_upgrade_script_regexp(_Config) ->
     ok.
 
 no_dot_erlang(Conf) ->
-    PrivDir = priv_dir(Conf),
+    PrivDir = ?config(data_dir,Conf),
     {ok, OrigWd} = file:get_cwd(),
     try
 	ok = file:set_cwd(PrivDir),
 
-	Erl = "\"" ++ filename:join([code:root_dir(),"bin","erl"]) ++ "\"",
-	Args = " -noinput -run io put_chars \"TESTOK\" -run erlang halt",
+	{ok, Wd} = file:get_cwd(),
+	io:format("Dir ~ts~n", [Wd]),
+
+	Erl0 =  filename:join([code:root_dir(),"bin","erl"]),
+	Erl = filename:nativename(Erl0),
+	Quote = "\"",
+	Args = " -noinput -run c pwd -run erlang halt",
 	ok = file:write_file(".erlang", <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
 
-	case os:cmd(Erl ++ Args) of
+	CMD1 = Quote ++ Erl ++ Quote ++ Args ,
+	case os:cmd(CMD1) of
 	    "DOT_ERLANG_READ" ++ _ -> ok;
 	    Other1 ->
-		io:format("Failed: ~ts~n",[Erl ++ Args]),
+		io:format("Failed: ~ts~n",[CMD1]),
 		io:format("Expected: ~s ++ _~n",["DOT_ERLANG_READ "]),
 		io:format("Got: ~ts~n",[Other1]),
-		exit(failed_to_start, test_error)
+		exit({failed_to_start, test_error})
 	end,
 	NO_DOT_ERL = " -boot no_dot_erlang",
-	case os:cmd(Erl ++ NO_DOT_ERL ++ Args) of
-	    "TESTOK" ++ _ -> ok;
-	    Other2 ->
-		io:format("Failed: ~ts~n",[Erl ++ Args]),
+	CMD2 = Quote ++ Erl ++ Quote ++ NO_DOT_ERL ++ Args,
+	case lists:prefix(Wd, Other2 = os:cmd(CMD2)) of
+	    true -> ok;
+	    false ->
+		io:format("Failed: ~ts~n",[CMD2]),
 		io:format("Expected: ~s~n",["TESTOK"]),
 		io:format("Got: ~ts~n",[Other2]),
-		exit(failed_to_start, no_dot_erlang)
+		exit({failed_to_start, no_dot_erlang})
 	end
     after
 	_ = file:delete(".erlang"),
-	ok = file:set_cwd(OrigWd)
+	ok = file:set_cwd(OrigWd),
+	ok
     end.
 
+
 %%%=================================================================
 %%% Misceleaneous functions
 %%%=================================================================