Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Oct 11 19:08:00 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Oct 12 16:17:30 2014 +0200
@@ -402,7 +402,7 @@
                     html += self.tr('Deleted {0}<br />\n')\
                         .format(Utilities.html_encode(f))
             
-            html += '</p>{0}<br/>\n'.format(80 * "=")
+            html += '</p>{0}<br/>\n'.format(60 * "=")
         
         self.contents.setHtml(html)
         tc = self.contents.textCursor()

--- a/QScintilla/Editor.py	Sat Oct 11 19:08:00 2014 +0200
+++ b/QScintilla/Editor.py	Sun Oct 12 16:17:30 2014 +0200
@@ -215,6 +215,7 @@
         self.acAPI = False
         
         self.__lastEditPosition = None
+        self.__annotationLines = 0
         
         # list of clones
         self.__clones = []
@@ -1947,7 +1948,9 @@
             vsb = self.verticalScrollBar()
             vsbMax = vsb.maximum()
             vsbValue = vsb.value()
-            vsb.setMaximum(vsbMax + annotationLinesAdded)
+            self.__annotationLines += annotationLinesAdded
+            vsb.setMaximum(max(self.lines() + self.__annotationLines - 
+                               self.linesOnScreen(), 0))
             if vsbValue == vsbMax:
                 vsb.setValue(vsb.maximum())