Mercurial Repositories > eric / changeset

--- a/QScintilla/Editor.py	Thu Jan 25 17:21:00 2018 +0100
+++ b/QScintilla/Editor.py	Thu Jan 25 17:47:09 2018 +0100
@@ -1231,7 +1231,7 @@
                 self.tr('Previous change'), self.previousChange)
         self.marginMenuActs["ClearChangeMarkers"] = \
             self.indicMarginMenu.addAction(
-                self.tr('Clear changes'), self.__deleteAllChangeMarkers)
+                self.tr('Clear changes'), self.__reinitOnlineChangeTrace)
         
         self.indicMarginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
@@ -1302,7 +1302,7 @@
                 self.tr('Previous change'), self.previousChange)
         self.marginMenuActs["ClearChangeMarkers"] = \
             self.marginMenu.addAction(
-                self.tr('Clear changes'), self.__deleteAllChangeMarkers)
+                self.tr('Clear changes'), self.__reinitOnlineChangeTrace)
         self.marginMenu.addSeparator()
         self.marginMenuActs["LMBbookmarks"] = self.marginMenu.addAction(
             self.tr('LMB toggles bookmarks'), self.__lmBbookmarks)

--- a/eric6.py	Thu Jan 25 17:21:00 2018 +0100
+++ b/eric6.py	Thu Jan 25 17:47:09 2018 +0100
@@ -37,7 +37,6 @@
 except AttributeError:
     pass
 
-
 import os
 import traceback
 import time