mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Do not let the children's buffer params leak into the master (#5941)
This commit is contained in:
parent
c920318f42
commit
975b20d5b7
@ -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();
|
||||
|
||||
|
@ -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());
|
||||
}
|
||||
}
|
||||
|
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user