The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit f309b3531ad03b8cbd1e47ccbe08058848dca4aa
Merge: b11704d b8fc1d5
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Sep 20 16:02:44 2012 +0200
Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
commit b11704d2fbd123c997f2bd2952a4193af1cf617a
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Wed Sep 19 10:14:56 2012 +0200
Do not update refs on new label creation (#8147)
This assures that refs to existing labels are not being touched if a new
label with a duplicate name is created, and the name then changed by the
duplicate checker.
Branch candidate.
(cherry picked from commit 86cccf10771cb00c71fac2becf39dd7e9a301d45)
diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index c483f94..34b7e62 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -55,9 +55,11 @@ InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams
const & p)
void InsetLabel::initView()
{
- // FIXME: This seems to be used only for inset creation so
- // we probably just need to call updateLabel() here.
- updateLabelAndRefs(getParam("name"));
+ // This seems to be used only for inset creation.
+ // Therefore we do not update refs here, since this would
+ // erroneously change refs from existing duplicate labels
+ // (#8141).
+ updateLabel(getParam("name"));
}
diff --git a/status.20x b/status.20x
index 2b90afa..689a0c9 100644
--- a/status.20x
+++ b/status.20x
@@ -133,6 +133,9 @@ What's new
- Fix crash when using undo in a paragraph with layout Bibliography (bug 7111).
+- Fix bug where references were erroneously changed when a duplicate label
+ name was resolved (bug 8147).
+
- Make sure that undo restores environment depth correctly (bug 8159).
- Make sure that undo restores paragraph longest label width correctly
-----------------------------------------------------------------------
Summary of changes:
src/insets/InsetLabel.cpp | 8 +++++---
status.20x | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
