anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +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-11-12 07:49:52 +01:00
parent c920318f42
commit 975b20d5b7
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Buffer.cpp
View File

@ -1857,7 +1857,11 @@ int Buffer::runChktex()
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);
updateMacros();

2
src/insets/InsetInclude.cpp
View File

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

5
status.20x
View File

@ -54,12 +54,15 @@ What's new
* DOCUMENT INPUT/OUTPUT
- Do not let child document's settings override master settings
(bug #5941).
* USER INTERFACE
- Fix regression in which clicking in the main work area always resets
the selected format in View>Source (bug #8411).
the selected format in View > Source (bug #8411).
- When selecting text and Insert > Preview, immediately display the
preview (bug #8075).