The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 08157b5050bb3cc5d9d5dac7c963763685e06ba9
Merge: 2fa840b 4729b1c
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Fri Oct 5 10:00:13 2012 +0200
Merge branch 'master' of git.lyx.org:lyx
commit 2fa840b7716f5907362a1457b5ed189e675cfb57
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Fri Oct 5 09:59:44 2012 +0200
Do not let the children's buffer params leak into the master (#5941)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2c18655..b0db5c7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1922,7 +1922,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);
for_each(paragraphs().begin(), paragraphs().end(),
bind(&Paragraph::validate, _1, ref(features)));
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 2a6f92b..2c0c412 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -934,7 +934,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());
}
}
-----------------------------------------------------------------------
Summary of changes:
src/Buffer.cpp | 6 +++++-
src/insets/InsetInclude.cpp | 2 ++
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
