Fix problem where annotations disappeared when SCI_CLEARDOCUMENTSTYLE called.

2 files changed, 4 insertions, 0 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 147eedb83..618049687 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -515,6 +515,9 @@
 	Bug fixed where style data was stale when deleting a rectangular selection.
 	</li>
 	<li>
+	Bug fixed where annotations disappeared when SCI_CLEARDOCUMENTSTYLE called.
+	</li>
+	<li>
 	Change the function prototypes to be complete for functions exported as "C".
 	<a href="http://sourceforge.net/p/scintilla/bugs/1618/">Bug #1618</a>.
 	</li>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index e0fc18162..13997de9f 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -2007,6 +2007,7 @@ void Editor::ClearDocumentStyle() {
 	pdoc->StartStyling(0, '\377');
 	pdoc->SetStyleFor(pdoc->Length(), 0);
 	cs.ShowAll();
+	SetAnnotationHeights(0, pdoc->LinesTotal());
 	pdoc->ClearLevels();
 }