[LyX/master] Correctly handle deleted text on inset-dissolve

Juergen Spitzmueller spitz at lyx.org
Fri Dec 27 13:16:28 UTC 2019


commit b2c2a6e15dbe2b9da26cfa75b5bb2076fc932c19
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri Dec 27 14:32:20 2019 +0100

    Correctly handle deleted text on inset-dissolve
    
    Part of #10128
---
 src/Text.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/Text.cpp b/src/Text.cpp
index e060a6c..7b7e67b 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.


More information about the lyx-cvs mailing list