The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 975b20d5b703087a3db4a9e90602a4f068310bc5
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Nov 12 07:49:52 2012 +0100
Do not let the children's buffer params leak into the master (#5941)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 9a16423..ac4f018 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -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();
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index d161fad..049039a 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -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());
}
}
diff --git a/status.20x b/status.20x
index 9993101..8b720ff 100644
--- a/status.20x
+++ b/status.20x
@@ -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).
-----------------------------------------------------------------------
Summary of changes:
src/Buffer.cpp | 6 +++++-
src/insets/InsetInclude.cpp | 2 ++
status.20x | 5 ++++-
3 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
