From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 6 Dec 2020 09:00:47 +0000 (+0100)
Subject: Always mark pasted stuff as changed with ct on
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=22193601bffd0dac4441e427780532c4ed27870f;p=features.git

Always mark pasted stuff as changed with ct on

independent of "Keep change tracking markup on copy and paste" pref.

Probably addresses #11973
---

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index b6aec8f5a5..fc555c1375 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -277,7 +277,13 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
 					tmpbuf->eraseChar(i--, false);
 		}
 
-		if (lyxrc.ct_markup_copied)
+		if (lyxrc.ct_markup_copied) {
+			// Only change to inserted if ct is active,
+			// otherwise leave markup as is
+			if (buffer.params().track_changes)
+				tmpbuf->setChange(Change(Change::INSERTED));
+		} else
+			// Resolve all markup to inserted or unchanged
 			tmpbuf->setChange(Change(buffer.params().track_changes ?
 						 Change::INSERTED : Change::UNCHANGED));
 	}