anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not let the children's buffer params leak into the master (#5941)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-10-05 09:59:44 +02:00
parent 2f7f0c7631
commit 2fa840b771
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Buffer.cpp
View File

@ -1922,7 +1922,11 @@ int Buffer::runChktex()
void Buffer::validate(LaTeXFeatures & features) const void Buffer::validate(LaTeXFeatures & features) const
{ {
params().validate(features); // Validate the buffer params, but not for included
// files, since they also use the parent buffer's
// params (# 5941)
if (!features.runparams().is_child)
params().validate(features);
for_each(paragraphs().begin(), paragraphs().end(), for_each(paragraphs().begin(), paragraphs().end(),
bind(&Paragraph::validate, _1, ref(features))); bind(&Paragraph::validate, _1, ref(features)));

2
src/insets/InsetInclude.cpp
View File

@ -934,7 +934,9 @@ void InsetInclude::validate(LaTeXFeatures & features) const
// otherwise it would always be the master buffer, // otherwise it would always be the master buffer,
// and nested includes would not work. // and nested includes would not work.
features.setBuffer(*tmp); features.setBuffer(*tmp);
features.runparams().is_child = true;
tmp->validate(features); tmp->validate(features);
features.runparams().is_child = false;
features.setBuffer(buffer()); features.setBuffer(buffer());
} }
} }