2 files changed, 3 insertions, 13 deletions
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index c21ad486e8..d8285d7288 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -19,8 +19,6 @@
 -module(dbg_debugged).
 
 %% External exports
-%% Avoid warning for local function demonitor/1 clashing with autoimported BIF.
--compile({no_auto_import,[demonitor/1]}).
 -export([eval/3]).
 
 %%====================================================================
@@ -47,7 +45,7 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 
 	%% Evaluated function has returned a value
 	{sys, Meta, {ready, Val}} ->
-	    demonitor(Mref),
+	    erlang:demonitor(Mref, [flush]),
 
 	    %% Restore original stacktrace and return the value
 	    try erlang:raise(throw, stack, SaveStacktrace)
@@ -63,7 +61,7 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 
 	%% Evaluated function raised an (uncaught) exception
 	{sys, Meta, {exception,{Class,Reason,Stacktrace}}} ->
-	    demonitor(Mref),
+	    erlang:demonitor(Mref, [flush]),
 
 	    %% ...raise the same exception
 	    erlang:error(erlang:raise(Class, Reason, Stacktrace), 
@@ -107,14 +105,6 @@ reply({eval,Expr,Bs}) ->
     %% Bindings is an orddict (sort them)
     erl_eval:expr(Expr, lists:sort(Bs)). % {value, Value, Bs2}
 
-%% Demonitor and delete message from inbox
-%%
-demonitor(Mref) ->
-    erlang:demonitor(Mref),
-    receive {'DOWN',Mref,_,_,_} -> ok
-    after 0 -> ok
-    end.
-
 %% Fix stacktrace - keep all above call to this module.
 %%
 stacktrace_f([]) -> [];
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);