aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/epp.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-02-21 08:20:32 +0100
committerHans Bolinder <[email protected]>2014-02-21 08:20:32 +0100
commit08b974280d05b136f6c2742ad8db0910356c5fd8 (patch)
treeb0ea5cf23a88f2dacd2e6f2e52cae97accc35b43 /lib/stdlib/src/epp.erl
parent259c048acfe24a57a3fecdb87b0a0879c3dc72c3 (diff)
parentb3bee03e513c5a3d777c6df360a2f421ba1cc610 (diff)
downloadotp-08b974280d05b136f6c2742ad8db0910356c5fd8.tar.gz
otp-08b974280d05b136f6c2742ad8db0910356c5fd8.tar.bz2
otp-08b974280d05b136f6c2742ad8db0910356c5fd8.zip
Merge branch 'hb/stdlib/epp_bug_fix/OTP-11728'
* hb/stdlib/epp_bug_fix/OTP-11728: Fix a bug in epp concerning circular macro definitions
Diffstat (limited to 'lib/stdlib/src/epp.erl')
-rw-r--r--lib/stdlib/src/epp.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 4fd302e612..dc25b6b9f4 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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
@@ -640,7 +640,7 @@ leave_file(From, St) ->
Ms = dict:store({atom,'FILE'},
{none,[{string,CurrLoc,OldName2}]},
St#epp.macs),
- NextSt = OldSt#epp{sstk=Sts,macs=Ms},
+ NextSt = OldSt#epp{sstk=Sts,macs=Ms,uses=St#epp.uses},
enter_file_reply(From, OldName, CurrLoc, CurrLoc),
case OldName2 =:= OldName of
true ->