diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-02-21 09:21:19 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-02-21 09:21:19 +1100 |
| commit | 6898bef4654b346bfc3d59a27b00eb3f78475454 (patch) | |
| tree | a150c38282c2987ecdeee6b27c2986b136716e84 | |
| parent | 9abd82e84b919dee983fea744506d6af917fe775 (diff) | |
| download | scintilla-mirror-6898bef4654b346bfc3d59a27b00eb3f78475454.tar.gz | |
Bug [#1577]. Deleting a whole line deletes the annotations on that line instead
of the annotations on the next line.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | src/PerLine.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index ecf3f4d1f..a98efe7ce 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -472,6 +472,10 @@ Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs. </li> <li> + Deleting a whole line deletes the annotations on that line instead of the annotations on the next line. + <a href="http://sourceforge.net/p/scintilla/bugs/1577/">Bug #1577</a>. + </li> + <li> Fix Qt bug where double click treated as triple click. <a href="http://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>. </li> diff --git a/src/PerLine.cxx b/src/PerLine.cxx index 7bf892240..8b0dbc44b 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -370,9 +370,9 @@ void LineAnnotation::InsertLine(int line) { } void LineAnnotation::RemoveLine(int line) { - if (annotations.Length() && (line < annotations.Length())) { - delete []annotations[line]; - annotations.Delete(line); + if (annotations.Length() && (line > 0) && (line <= annotations.Length())) { + delete []annotations[line-1]; + annotations.Delete(line-1); } } |