diff -r 4550d8e34765 -r 3d88d53f8c2b E5Gui/E5GenericDiffHighlighter.py
--- a/E5Gui/E5GenericDiffHighlighter.py Thu Mar 09 17:56:06 2017 +0100
+++ b/E5Gui/E5GenericDiffHighlighter.py Thu Mar 09 19:28:59 2017 +0100
@@ -137,14 +137,14 @@
self.setFormat(0, len(text), self.normalFormat)
return
- for match, format in formats:
+ for match, formatStr in formats:
start = match.start()
groups = match.groups()
# No groups in the regex, assume this is a single rule
# that spans the entire line
if not groups:
- self.setFormat(0, len(text), format)
+ self.setFormat(0, len(text), formatStr)
continue
# Groups exist, rule is a tuple corresponding to group
@@ -155,7 +155,7 @@
# allow None as a no-op format
length = len(group)
- if format[groupIndex]:
+ if formatStr[groupIndex]:
self.setFormat(start, start + length,
- format[groupIndex])
+ formatStr[groupIndex])
start += length
