Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Mon Sep 23 14:37:31 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Tue Sep 24 17:52:41 2024 +0200
@@ -8,7 +8,6 @@
 process.
 """
 
-import contextlib
 import os
 import tempfile
 
@@ -1118,11 +1117,24 @@
         """
         Private slot to generate diff outputs for the selected item.
         """
+        colors = {
+            "text": Preferences.getDiffColour("TextColor"),
+            "added": Preferences.getDiffColour("AddedColor"),
+            "removed": Preferences.getDiffColour("RemovedColor"),
+            "replaced": Preferences.getDiffColour("ReplacedColor"),
+            "context": Preferences.getDiffColour("ContextColor"),
+            "header": Preferences.getDiffColour("HeaderColor"),
+            "whitespace": Preferences.getDiffColour("BadWhitespaceColor"),
+        }
+        self.lDiffHighlighter.regenerateRules(
+            colors, Preferences.getEditorOtherFonts("MonospacedFont")
+        )
+        self.rDiffHighlighter.regenerateRules(
+            colors, Preferences.getEditorOtherFonts("MonospacedFont")
+        )
+
         self.lDiffEdit.clear()
         self.rDiffEdit.clear()
-        with contextlib.suppress(AttributeError):
-            self.lDiffHighlighter.regenerateRules()
-            self.rDiffHighlighter.regenerateRules()
 
         selectedItems = self.statusList.selectedItems()
         if len(selectedItems) == 1: