diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-03 14:28:17 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-03 14:28:17 +0200 |
| commit | b306fa57d3f78b86fea04438483e2d34fcb91d0e (patch) | |
| tree | a909621a8903413a41edcc95736cb5be59cd03ec /lib/stdlib/src | |
| parent | 31f93961ef487122000b9f16fc660dfd1479633b (diff) | |
| parent | d08b9775ad07a89d070aa653a1e5549ce705d524 (diff) | |
| download | otp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.tar.gz otp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.tar.bz2 otp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.zip | |
Merge branch 'maint'
Conflicts:
bootstrap/lib/stdlib/ebin/epp.beam
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/epp.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl index 64ee456b71..5bd6a224a2 100644 --- a/lib/stdlib/src/epp.erl +++ b/lib/stdlib/src/epp.erl @@ -601,7 +601,7 @@ enter_file2(NewF, Pname, From, St0, AtLocation) -> %% file will depend on the order of file inclusions in the parent files Path = [filename:dirname(Pname) | tl(St0#epp.path)], _ = set_encoding(NewF), - #epp{file=NewF,location=Loc,name=Pname,delta=0, + #epp{file=NewF,location=Loc,name=Pname,name2=Pname,delta=0, sstk=[St0|St0#epp.sstk],path=Path,macs=Ms}. enter_file_reply(From, Name, Location, AtLocation) -> |