X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=8ea11399ea6648b34bc3beac239c3004aae2433c;hb=26c5e8a83bd337e3a66e46b6ffcee85a12f09a55;hp=b49f2551509ee921b8af5db1e07b6817c8c154b1;hpb=438aaf2ec989d9cdcefe6e59bdc324c8398782bb;p=features.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index b49f255150..8ea11399ea 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -54,9 +54,9 @@ bool Change::isSimilarTo(Change const & change) const
 }
 
 
-ColorCode Change::color() const
+Color Change::color() const
 {
-	ColorCode color = Color_none;
+	Color color = Color_none;
 	switch (author % 5) {
 		case 0:
 			color = Color_changedtextauthor1;
@@ -74,6 +74,10 @@ ColorCode Change::color() const
 			color = Color_changedtextauthor5;
 			break;
 	}
+
+	if (deleted())
+		color.mergeColor = Color_deletedtextmodifier;
+
 	return color;
 }