Revision: 4472 http://geany.svn.sourceforge.net/geany/?rev=4472&view=rev Author: ntrel Date: 2009-12-07 14:17:40 +0000 (Mon, 07 Dec 2009)
Log Message: ----------- Remove duplicate sci_set_keywords(), make argument const.
Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-12-07 14:12:40 UTC (rev 4471) +++ trunk/ChangeLog 2009-12-07 14:17:40 UTC (rev 4472) @@ -4,6 +4,8 @@ Highlight D & Java types from a global tags file. * src/highlighting.c, doc/geany.txt, doc/geany.html: Add debug message warning if recursive lexer_filetype is set. + * src/highlighting.c, src/sciwrappers.c, src/sciwrappers.h: + Remove duplicate sci_set_keywords(), make argument const.
2009-12-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-12-07 14:12:40 UTC (rev 4471) +++ trunk/src/highlighting.c 2009-12-07 14:17:40 UTC (rev 4472) @@ -42,6 +42,7 @@ #include "utils.h" #include "main.h" #include "support.h" +#include "sciwrappers.h"
#define GEANY_COLORSCHEMES_SUBDIR "colorschemes" @@ -126,12 +127,6 @@ }
-static void sci_set_keywords(ScintillaObject *sci, gint idx, const gchar *words) -{ - SSM(sci, SCI_SETKEYWORDS, idx, (sptr_t) words); -} - - static void new_styleset(gint file_type_id, gint styling_count) { StyleSet *set = &style_sets[file_type_id];
Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-12-07 14:12:40 UTC (rev 4471) +++ trunk/src/sciwrappers.c 2009-12-07 14:17:40 UTC (rev 4472) @@ -942,7 +942,7 @@ }
-void sci_set_keywords(ScintillaObject *sci, gint k, gchar *text) +void sci_set_keywords(ScintillaObject *sci, gint k, const gchar *text) { SSM(sci, SCI_SETKEYWORDS, k, (sptr_t) text); }
Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2009-12-07 14:12:40 UTC (rev 4471) +++ trunk/src/sciwrappers.h 2009-12-07 14:17:40 UTC (rev 4472) @@ -146,7 +146,7 @@ gint sci_get_target_end (ScintillaObject *sci); gint sci_replace_target (ScintillaObject *sci, const gchar *text, gboolean regex);
-void sci_set_keywords (ScintillaObject *sci, gint k, gchar *text); +void sci_set_keywords (ScintillaObject *sci, gint k, const gchar *text); gint sci_get_lexer (ScintillaObject *sci); void sci_set_readonly (ScintillaObject *sci, gboolean readonly); gint sci_get_zoom (ScintillaObject *sci);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.