From 1e409a1a754110b420b19f0325f6cc7f5d1ba10a Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 21 Mar 2020 15:54:37 +0100
Subject: [PATCH] Properly resolve tracked changes when pasting multiple
 tabular cells

Fixes #11791
---
 src/insets/InsetTabular.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index e1ee36d676..dc8be284b2 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -7131,9 +7131,12 @@ bool InsetTabular::pasteClipboard(Cursor & cur)
 			// FIXME?: why do we need to do this explicitly? (EL)
 			tabular.cellInset(r2, c2)->setBuffer(tabular.buffer());
 
-			// FIXME: change tracking (MG)
-			inset->setChange(Change(buffer().params().track_changes ?
+			if (!lyxrc.ct_markup_copied) {
+				// do not paste deleted text
+				inset->acceptChanges();
+				inset->setChange(Change(buffer().params().track_changes ?
 						Change::INSERTED : Change::UNCHANGED));
+			}
 			cur.pos() = 0;
 			cur.pit() = 0;
 		}
-- 
2.39.2