Mercurial Repositories > eric / file diff

--- a/QScintilla/QsciScintillaCompat.py	Sat Mar 11 13:11:29 2017 +0100
+++ b/QScintilla/QsciScintillaCompat.py	Sat Mar 11 14:35:22 2017 +0100
@@ -1432,28 +1432,28 @@
     ###########################################################################
     
     if "showUserList" not in QsciScintilla.__dict__:
-        def showUserList(self, id, lst):
+        def showUserList(self, listId, lst):
             """
             Public method to show a user supplied list.
             
-            @param id id of the list (integer)
+            @param listId id of the list (integer)
             @param lst list to be show (list of strings)
             """
-            if id <= 0:
+            if listId <= 0:
                 return
             
             self.SendScintilla(
                 QsciScintilla.SCI_AUTOCSETSEPARATOR,
                 ord(self.UserSeparator))
             self.SendScintilla(
-                QsciScintilla.SCI_USERLISTSHOW, id,
+                QsciScintilla.SCI_USERLISTSHOW, listId,
                 self._encodeString(self.UserSeparator.join(lst)))
     
     ###########################################################################
     ## work-arounds for buggy behavior
     ###########################################################################
     
-    def __completionListSelected(self, id, txt):
+    def __completionListSelected(self, listId, txt):
         """
         Private slot to handle the selection from the completion list.
         
@@ -1462,7 +1462,7 @@
         list but not giving it back when an item is selected via a
         double-click.
         
-        @param id the ID of the user list (integer)
+        @param listId the ID of the user list (integer)
         @param txt the selected text (string)
         """
         self.activateWindow()