aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--src/Editor.cxx2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e3d0dce25..1236efd7d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -538,6 +538,10 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1848/">Bug #1848</a>.
</li>
<li>
+ Fix folding inconsistency when fold header added above a folded part.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1896/">Bug #1896</a>.
+ </li>
+ <li>
SciTE on GTK+ can have a wide divider between the panes with the
split.wide property.
</li>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 8e4ebf18a..29f0681fd 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -5500,7 +5500,7 @@ void Editor::FoldChanged(int line, int levelNow, int levelPrev) {
if (!(levelNow & SC_FOLDLEVELWHITEFLAG) && (LevelNumber(levelPrev) < LevelNumber(levelNow))) {
if (cs.HiddenLines()) {
const int parentLine = pdoc->GetFoldParent(line);
- if (!cs.GetExpanded(parentLine) && cs.GetExpanded(line))
+ if (!cs.GetExpanded(parentLine) && cs.GetVisible(line))
FoldLine(parentLine, SC_FOLDACTION_EXPAND);
}
}