Fix bug 5629: http://bugzilla.lyx.org/show_bug.cgi?id=5629.

[features.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index b49f2551509ee921b8af5db1e07b6817c8c154b1..8ea11399ea6648b34bc3beac239c3004aae2433c 100644 (file)
--- 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;
 }