diff options
| author | nyamatongwe <devnull@localhost> | 2013-04-24 16:33:36 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2013-04-24 16:33:36 +1000 |
| commit | 440e6883c5563a04ba46de3dbe4949f20cde5124 (patch) | |
| tree | 88b626f907b6969a1be3f7a22c9b4ea5fed7b51a /src/Document.cxx | |
| parent | 3438ec5950c6ff3fcd9d4feb5c831ebbde93d60c (diff) | |
| download | scintilla-mirror-440e6883c5563a04ba46de3dbe4949f20cde5124.tar.gz | |
Cosmetic: remove line-end whitespace.
Diffstat (limited to 'src/Document.cxx')
| -rw-r--r-- | src/Document.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index d62dd64e0..068d406cf 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -420,7 +420,7 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in int lookLine = line; int lookLineLevel = level; int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || + while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) { lookLineLevel = GetLevel(--lookLine); lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; @@ -453,8 +453,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in } } if (firstChangeableLineBefore == -1) { - for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine >= beginFoldBlock; + for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine >= beginFoldBlock; lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineBefore = lookLine; @@ -466,8 +466,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in firstChangeableLineBefore = beginFoldBlock - 1; int firstChangeableLineAfter = -1; - for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine <= endFoldBlock; + for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine <= endFoldBlock; lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineAfter = lookLine; @@ -715,7 +715,7 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const { // Shift_jis return ((uch >= 0x81) && (uch <= 0x9F)) || ((uch >= 0xE0) && (uch <= 0xFC)); - // Lead bytes F0 to FC may be a Microsoft addition. + // Lead bytes F0 to FC may be a Microsoft addition. case 936: // GBK return (uch >= 0x81) && (uch <= 0xFE); |