From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Thu, 29 Oct 2009 13:36:22 +0000 (+0000)
Subject: Fix bug #6292: Ensure the current language is set correctly after dissolving an Inset.
X-Git-Tag: 2.0.0~5268
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d0859f23d0fe4656fcc814d14f1f0ef662252c84;p=features.git

Fix bug #6292: Ensure the current language is set correctly after dissolving an Inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31790 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Text.cpp b/src/Text.cpp
index 54ee423d1a..769285a149 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1616,6 +1616,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// this is the least that needs to be done (bug 6003)
 		// in the above case, pasteParagraphList handles this
 		cur.buffer()->updateLabels();
+
+	// Ensure the current language is set correctly (bug 6292)
+	cur.text()->setCursor(cur, cur.pit(), cur.pos());
 	cur.clearSelection();
 	cur.resetAnchor();
 	return true;