Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

src/LaTeX.cpp

@@ -996,7 +996,7 @@ bool completeFilename(string const & ff, DepTable & head)
 }
 
 
-int iterateLine(string const token, regex const reg, string const closing,
+int iterateLine(string const token, regex const reg, string const & closing,
 		int fragment_pos, DepTable & head)
 {
 	smatch what;

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"));
 }
 
 

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