diff options
| author | Dan Gudmundsson <[email protected]> | 2013-01-15 09:19:32 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-15 09:19:32 +0100 |
| commit | 0324fe0502d843830e6fe128e307601f21a60f26 (patch) | |
| tree | 299db89395e593c0eded9790e69992259ca60058 /lib/debugger/src/dbg_ieval.erl | |
| parent | 364ec900a6f974e7bc184bb3d5d67e85765353e0 (diff) | |
| parent | 7f048c5d71534d458351513e84bb879c47f2c76e (diff) | |
| download | otp-0324fe0502d843830e6fe128e307601f21a60f26.tar.gz otp-0324fe0502d843830e6fe128e307601f21a60f26.tar.bz2 otp-0324fe0502d843830e6fe128e307601f21a60f26.zip | |
Merge branch 'dgud/debugger/unicode/OTP-10679'
* dgud/debugger/unicode/OTP-10679:
debugger: View terms as unicode-strings
debugger: Fix code viewing on wxWidgets-2.9
debugger: Remove bad gs:call
debugger: Fix user evalution dependent of bindings in trace window
Diffstat (limited to 'lib/debugger/src/dbg_ieval.erl')
| -rw-r--r-- | lib/debugger/src/dbg_ieval.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl index 5e5948c965..3c084c53ac 100644 --- a/lib/debugger/src/dbg_ieval.erl +++ b/lib/debugger/src/dbg_ieval.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2012. All Rights Reserved. +%% Copyright Ericsson AB 1998-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 @@ -249,7 +249,7 @@ meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) -> {sys, Debugged, {value,Val}} -> {value, Val, Bs}; {sys, Debugged, {value,Val,Bs2}} -> - {value, Val, Bs2}; + {value, Val, merge_bindings(Bs2, Bs, Ieval)}; {sys, Debugged, {exception,{Class,Reason,Stk}}} -> case get(exit_info) of |