From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 27 Dec 2019 13:32:20 +0000 (+0100)
Subject: Correctly handle deleted text on inset-dissolve
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~1390
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b2c2a6e15dbe2b9da26cfa75b5bb2076fc932c19;p=features.git

Correctly handle deleted text on inset-dissolve

Part of #10128
---

diff --git a/src/Text.cpp b/src/Text.cpp
index e060a6c9dd..7b7e67bbb7 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1812,6 +1812,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// but we'll try the cheaper solution here.
 		cur.buffer()->clearReferenceCache();
 
+		// Do not revive deleted text
+		lyx::acceptChanges(plist, b.params());
+
 		// ERT paragraphs have the Language latex_language.
 		// This is invalid outside of ERT, so we need to
 		// change it to the buffer language.