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

Applied patch from Bob Doan to do not set keywords for XML documents(thanks).

Browse Source 
Made styleset_markup() static.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@968 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-11-04 22:38:11 +00:00
parent d6500e59ea
commit dd47b2bf62
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-11-04 Enrico Tröger <enrico.troeger@uvena.de>
* src/highlighting.c, src/highlighting.h:
Applied patch from Bob Doan to do not set keywords for XML
documents(thanks).
Made styleset_markup() static.
2006-11-04 Nick Treleaven <nick.treleaven@btinternet.com>
* src/search.c: Fix pressing enter to search from the Find dialog.

1
THANKS
View File

@ -18,6 +18,7 @@ Kristoffer A. Tjernås <kt(at)nupi(dot)no>
Tamim <amitamim(at)gmail(dot)com>
Kevin Ellwood <kellwood(at)ameritech(dot)net>
Stefan Oltmanns <stefan(dot)oltmanns(at)abi2006(dot)gymnasium-achim(dot)de> - escape sequences patch
Bob Doan <bdoan(at)sicom(dot)com> - some patches
Translators:
----------------------------------

25
src/highlighting.c
View File

@ -31,6 +31,8 @@
#include "symbols.h"
static void styleset_markup(ScintillaObject *sci, gboolean set_keywords);
typedef struct
{
gint foreground;
@ -995,7 +997,7 @@ void styleset_php(ScintillaObject *sci)
SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0);
// use the same colouring as for XML
styleset_markup(sci);
styleset_markup(sci, TRUE);
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PHP].wordchars);
}
@ -1034,7 +1036,7 @@ void styleset_html(ScintillaObject *sci)
SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0);
// use the same colouring for HTML; XML and so on
styleset_markup(sci);
styleset_markup(sci, TRUE);
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_HTML].wordchars);
}
@ -1125,16 +1127,19 @@ static void styleset_markup_init(void)
}
void styleset_markup(ScintillaObject *sci)
static void styleset_markup(ScintillaObject *sci, gboolean set_keywords)
{
if (style_sets[GEANY_FILETYPES_XML].styling == NULL) styleset_markup_init();
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]);
// don't set keywords for plain XML
if(set_keywords)
{
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]);
}
SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[5]);
// hotspotting, nice thing
@ -1732,7 +1737,7 @@ void styleset_xml(ScintillaObject *sci)
SSM (sci, SCI_SETLEXER, SCLEX_XML, 0);
// use the same colouring for HTML; XML and so on
styleset_markup(sci);
styleset_markup(sci, FALSE);
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_XML].wordchars);
}

2
src/highlighting.h
View File

@ -62,8 +62,6 @@ void styleset_sh(ScintillaObject *sci);
void styleset_xml(ScintillaObject *sci);
void styleset_markup(ScintillaObject *sci);
void styleset_docbook(ScintillaObject *sci);
void styleset_none(ScintillaObject *sci);