diff options
author | Weblate <noreply@weblate.org> | 2016-09-16 19:38:14 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2016-09-16 19:38:14 +0000 |
commit | 8be77a80c4430b85dae569923c3efc6ed2384472 (patch) | |
tree | a972234c061667fcd01fb2d76220567af1abe34f /src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h | |
parent | Translated using Weblate (lumina_DESKTOP@fa (generated)) (diff) | |
parent | Add syntax highlighting for "shell" files (.sh) (diff) | |
download | lumina-8be77a80c4430b85dae569923c3efc6ed2384472.tar.gz lumina-8be77a80c4430b85dae569923c3efc6ed2384472.tar.bz2 lumina-8be77a80c4430b85dae569923c3efc6ed2384472.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h')
-rw-r--r-- | src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h index 781ff65d..f834e275 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h +++ b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h @@ -101,7 +101,7 @@ protected: if(splitactive>=0 || index<start){ continue; } //skip this one - falls within a multi-line pattern above while(index>=0){ int len = patt.matchedLength(); - setFormat(index, len, rules[i].format); + if(format(index)==currentBlock().charFormat()){ setFormat(index, len, rules[i].format); } //only apply highlighting if not within a section already index = patt.indexIn(text, index+len); //go to the next match } }//end loop over normal (single-line) patterns |