HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unset maybe previously keywords when setting up Scintilla for XML files. This fixed wrong highlighting after switching back to filetype XML from another one.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3780 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-05-11 15:56:08 +00:00
parent 66b78ad961
commit ecfbe40cdc
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-05-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/highlighting.c:
Unset maybe previously keywords when setting up Scintilla for
XML files. This fixed wrong highlighting after switching back to
filetype XML from another one.
2009-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/ui_utils.c:

17
src/highlighting.c
View File

@ -467,7 +467,7 @@ static void styleset_common(ScintillaObject *sci)
else
SSM(sci, SCI_SETCARETSTYLE, CARETSTYLE_LINE, 0);
/* colourize the current line */
/* colourise the current line */
SSM(sci, SCI_SETCARETLINEBACK, invert(common_style_set.styling[GCS_CURRENT_LINE].background), 0);
/* bold=enable current line */
SSM(sci, SCI_SETCARETLINEVISIBLE, common_style_set.styling[GCS_CURRENT_LINE].bold, 0);
@ -1268,6 +1268,9 @@ static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_
static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
{
guint i;
const gchar *keywords;
/* Used by several filetypes */
if (style_sets[GEANY_FILETYPES_XML].styling == NULL)
filetypes_load_config(GEANY_FILETYPES_XML, FALSE);
@ -1275,14 +1278,12 @@ static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
/* manually initialise filetype Python for use with embedded Python */
filetypes_load_config(GEANY_FILETYPES_PYTHON, FALSE);
/* don't set keywords for plain XML */
if (set_keywords)
/* Set keywords. If we don't want to use keywords, we must at least unset maybe previously set
* keywords, e.g. when switching between filetypes. */
for (i = 0; i < 5; i++)
{
SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[0]);
SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[1]);
SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[2]);
SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[3]);
SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[4]);
keywords = (set_keywords) ? style_sets[GEANY_FILETYPES_XML].keywords[i] : "";
SSM(sci, SCI_SETKEYWORDS, i, (sptr_t) keywords);
}
SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[5]);