diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-10-14 10:29:17 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-10-14 10:29:17 +1100 |
| commit | dc8598f54601fe734184e7fd69f0a2fe653077b8 (patch) | |
| tree | 23720c36e6df2b83e52bac6b96d6f069855ed6db | |
| parent | 451c55458e82cd382da0c97df3a54274e6cfafbd (diff) | |
| download | scintilla-mirror-dc8598f54601fe734184e7fd69f0a2fe653077b8.tar.gz | |
Bug [#1664]. Fix folding of "block" keyword.
From danselmi.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexVHDL.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 12fa7123a..374dad6fe 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -493,6 +493,10 @@ ensure no clash between the use of indicators for IME and for the application. </li> <li> + VHDL folder fixes "block" keyword. + <a href="http://sourceforge.net/p/scintilla/bugs/1664/">Bug #1664</a>. + </li> + <li> Prevent caret blinking when holding down Delete key. <a href="http://sourceforge.net/p/scintilla/bugs/1657/">Bug #1657</a>. </li> diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx index d917fa547..fe1b33317 100644 --- a/lexers/LexVHDL.cxx +++ b/lexers/LexVHDL.cxx @@ -207,7 +207,7 @@ static void FoldNoBoxVHDLDoc( // Decided it would be smarter to have the lexer have all keywords included. Therefore I // don't check if the style for the keywords that I use to adjust the levels. char words[] = - "architecture begin case component else elsif end entity generate loop package process record then " + "architecture begin block case component else elsif end entity generate loop package process record then " "procedure function when"; WordList keywords; keywords.Set(words); @@ -369,6 +369,7 @@ static void FoldNoBoxVHDLDoc( strcmp(s, "architecture") == 0 || strcmp(s, "case") == 0 || strcmp(s, "generate") == 0 || + strcmp(s, "block") == 0 || strcmp(s, "loop") == 0 || strcmp(s, "package") ==0 || strcmp(s, "process") == 0 || |