Mercurial Repositories > eric / file diff

--- a/UI/CompareDialog.py	Sat Mar 11 13:11:29 2017 +0100
+++ b/UI/CompareDialog.py	Sat Mar 11 14:35:22 2017 +0100
@@ -179,20 +179,21 @@
             self.file1Picker.setText(filename)
         super(CompareDialog, self).show()
         
-    def __appendText(self, pane, linenumber, line, format, interLine=False):
+    def __appendText(self, pane, linenumber, line, charFormat,
+                     interLine=False):
         """
         Private method to append text to the end of the contents pane.
         
         @param pane text edit widget to append text to (QTextedit)
         @param linenumber number of line to insert (string)
         @param line text to insert (string)
-        @param format text format to be used (QTextCharFormat)
+        @param charFormat text format to be used (QTextCharFormat)
         @param interLine flag indicating interline changes (boolean)
         """
         tc = pane.textCursor()
         tc.movePosition(QTextCursor.End)
         pane.setTextCursor(tc)
-        pane.setCurrentCharFormat(format)
+        pane.setCurrentCharFormat(charFormat)
         if interLine:
             pane.insertPlainText("{0} ".format(linenumber))
             for txt in re.split(self.markerPattern, line):
@@ -202,7 +203,7 @@
                         tc = pane.textCursor()
                         tc.movePosition(QTextCursor.End)
                         pane.setTextCursor(tc)
-                        pane.setCurrentCharFormat(format)
+                        pane.setCurrentCharFormat(charFormat)
                         pane.insertPlainText(txt1)
                     tc = pane.textCursor()
                     tc.movePosition(QTextCursor.End)