Mercurial Repositories > eric / file diff

--- a/E5Gui/E5GenericDiffHighlighter.py	Tue Mar 07 18:46:09 2017 +0100
+++ b/E5Gui/E5GenericDiffHighlighter.py	Tue Mar 07 18:53:18 2017 +0100
@@ -110,20 +110,20 @@
         @return format definiton (QTextCharFormat)
         """
         font = Preferences.getEditorOtherFonts("MonospacedFont")
-        format = QTextCharFormat()
-        format.setFontFamily(font.family())
-        format.setFontPointSize(font.pointSize())
+        charFormat = QTextCharFormat()
+        charFormat.setFontFamily(font.family())
+        charFormat.setFontPointSize(font.pointSize())
         
         if fg:
-            format.setForeground(fg)
+            charFormat.setForeground(fg)
         
         if bg:
-            format.setBackground(bg)
+            charFormat.setBackground(bg)
         
         if bold:
-            format.setFontWeight(QFont.Bold)
+            charFormat.setFontWeight(QFont.Bold)
         
-        return format
+        return charFormat
     
     def highlightBlock(self, text):
         """