SF.net SVN: geany: [1020] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Thu Nov 23 11:42:10 UTC 2006
Revision: 1020
http://svn.sourceforge.net/geany/?rev=1020&view=rev
Author: ntrel
Date: 2006-11-23 03:42:10 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems
with word matching when using Find & Replace functions.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.asm
trunk/data/filetypes.c
trunk/data/filetypes.caml
trunk/data/filetypes.conf
trunk/data/filetypes.cpp
trunk/data/filetypes.css
trunk/data/filetypes.d
trunk/data/filetypes.diff
trunk/data/filetypes.docbook
trunk/data/filetypes.ferite
trunk/data/filetypes.fortran
trunk/data/filetypes.html
trunk/data/filetypes.java
trunk/data/filetypes.latex
trunk/data/filetypes.makefile
trunk/data/filetypes.oms
trunk/data/filetypes.pascal
trunk/data/filetypes.perl
trunk/data/filetypes.php
trunk/data/filetypes.python
trunk/data/filetypes.ruby
trunk/data/filetypes.sh
trunk/data/filetypes.sql
trunk/data/filetypes.tcl
trunk/data/filetypes.vhdl
trunk/data/filetypes.xml
trunk/doc/geany.docbook
trunk/src/geany.h
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/ChangeLog 2006-11-23 11:42:10 UTC (rev 1020)
@@ -1,3 +1,11 @@
+2006-11-23 Nick Treleaven <nick.treleaven at btinternet.com>
+
+ * src/highlighting.c, src/geany.h, doc/geany.docbook,
+ data/filetypes.*:
+ Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems
+ with word matching when using Find & Replace functions.
+
+
2006-11-22 Frank Lanitz <frank at frank.uvena.de>
* po/hu.po, src/about.c, THANKS, configure.in:
Modified: trunk/data/filetypes.asm
===================================================================
--- trunk/data/filetypes.asm 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.asm 2006-11-23 11:42:10 UTC (rev 1020)
@@ -27,7 +27,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=;
Modified: trunk/data/filetypes.c
===================================================================
--- trunk/data/filetypes.c 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.c 2006-11-23 11:42:10 UTC (rev 1020)
@@ -31,7 +31,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=//
Modified: trunk/data/filetypes.caml
===================================================================
--- trunk/data/filetypes.caml 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.caml 2006-11-23 11:42:10 UTC (rev 1020)
@@ -24,7 +24,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=(*
Modified: trunk/data/filetypes.conf
===================================================================
--- trunk/data/filetypes.conf 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.conf 2006-11-23 11:42:10 UTC (rev 1020)
@@ -13,7 +13,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.cpp
===================================================================
--- trunk/data/filetypes.cpp 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.cpp 2006-11-23 11:42:10 UTC (rev 1020)
@@ -31,7 +31,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=//
Modified: trunk/data/filetypes.css
===================================================================
--- trunk/data/filetypes.css 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.css 2006-11-23 11:42:10 UTC (rev 1020)
@@ -26,7 +26,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=/*
Modified: trunk/data/filetypes.d
===================================================================
--- trunk/data/filetypes.d 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.d 2006-11-23 11:42:10 UTC (rev 1020)
@@ -31,7 +31,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=//
Modified: trunk/data/filetypes.diff
===================================================================
--- trunk/data/filetypes.diff 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.diff 2006-11-23 11:42:10 UTC (rev 1020)
@@ -12,7 +12,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# only the text before the first --- is a comment
comment_open=
Modified: trunk/data/filetypes.docbook
===================================================================
--- trunk/data/filetypes.docbook 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.docbook 2006-11-23 11:42:10 UTC (rev 1020)
@@ -39,7 +39,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=<!--
Modified: trunk/data/filetypes.ferite
===================================================================
--- trunk/data/filetypes.ferite 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.ferite 2006-11-23 11:42:10 UTC (rev 1020)
@@ -29,7 +29,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=@_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=//
Modified: trunk/data/filetypes.fortran
===================================================================
--- trunk/data/filetypes.fortran 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.fortran 2006-11-23 11:42:10 UTC (rev 1020)
@@ -28,7 +28,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=c
Modified: trunk/data/filetypes.html
===================================================================
--- trunk/data/filetypes.html 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.html 2006-11-23 11:42:10 UTC (rev 1020)
@@ -5,7 +5,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
# these comments are used for PHP, the comments used in HTML are in filetypes.xml
Modified: trunk/data/filetypes.java
===================================================================
--- trunk/data/filetypes.java 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.java 2006-11-23 11:42:10 UTC (rev 1020)
@@ -30,7 +30,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=/*
Modified: trunk/data/filetypes.latex
===================================================================
--- trunk/data/filetypes.latex 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.latex 2006-11-23 11:42:10 UTC (rev 1020)
@@ -14,7 +14,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=%
Modified: trunk/data/filetypes.makefile
===================================================================
--- trunk/data/filetypes.makefile 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.makefile 2006-11-23 11:42:10 UTC (rev 1020)
@@ -14,7 +14,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.oms
===================================================================
--- trunk/data/filetypes.oms 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.oms 2006-11-23 11:42:10 UTC (rev 1020)
@@ -20,7 +20,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.pascal
===================================================================
--- trunk/data/filetypes.pascal 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.pascal 2006-11-23 11:42:10 UTC (rev 1020)
@@ -20,7 +20,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open={
Modified: trunk/data/filetypes.perl
===================================================================
--- trunk/data/filetypes.perl 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.perl 2006-11-23 11:42:10 UTC (rev 1020)
@@ -25,7 +25,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.php
===================================================================
--- trunk/data/filetypes.php 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.php 2006-11-23 11:42:10 UTC (rev 1020)
@@ -5,7 +5,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_$#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
# these comments are used for PHP, the comments used in HTML are in filetypes.xml
Modified: trunk/data/filetypes.python
===================================================================
--- trunk/data/filetypes.python 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.python 2006-11-23 11:42:10 UTC (rev 1020)
@@ -23,7 +23,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.ruby
===================================================================
--- trunk/data/filetypes.ruby 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.ruby 2006-11-23 11:42:10 UTC (rev 1020)
@@ -28,7 +28,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.sh
===================================================================
--- trunk/data/filetypes.sh 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.sh 2006-11-23 11:42:10 UTC (rev 1020)
@@ -19,7 +19,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.sql
===================================================================
--- trunk/data/filetypes.sql 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.sql 2006-11-23 11:42:10 UTC (rev 1020)
@@ -24,7 +24,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=/*
Modified: trunk/data/filetypes.tcl
===================================================================
--- trunk/data/filetypes.tcl 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.tcl 2006-11-23 11:42:10 UTC (rev 1020)
@@ -30,7 +30,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=#
Modified: trunk/data/filetypes.vhdl
===================================================================
--- trunk/data/filetypes.vhdl 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.vhdl 2006-11-23 11:42:10 UTC (rev 1020)
@@ -29,7 +29,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=--
Modified: trunk/data/filetypes.xml
===================================================================
--- trunk/data/filetypes.xml 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/data/filetypes.xml 2006-11-23 11:42:10 UTC (rev 1020)
@@ -76,7 +76,7 @@
[settings]
# the following characters are these which a "word" can contains, see documentation
-wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
comment_open=<!--
Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/doc/geany.docbook 2006-11-23 11:42:10 UTC (rev 1020)
@@ -759,7 +759,11 @@
<tbody>
<row>
<entry>GEANY_WORDCHARS</entry>
- <entry>These characters define word boundaries.</entry>
+ <entry>
+ These characters define word boundaries when
+ making selections and searching using word matching
+ options.
+ </entry>
<entry>(look at sourcecode)</entry>
</row>
<row>
@@ -1453,10 +1457,12 @@
<tbody>
<row>
<entry>wordchars</entry>
- <entry>Word delimiting characters. These characters define
- word boundaries.
+ <entry>
+ These characters define word boundaries when
+ making selections and searching using word matching
+ options.
</entry>
- <entry>(look at sourcecode)</entry>
+ <entry>(look at system filetypes.* files)</entry>
</row>
<row>
<entry>comment_open</entry>
Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/src/geany.h 2006-11-23 11:42:10 UTC (rev 1020)
@@ -40,7 +40,7 @@
#define GEANY_HOMEPAGE "http://geany.uvena.de/"
#define GEANY_USE_WIN32_DIALOG 0
#define GEANY_CHECK_FILE_DELAY 30
-#define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\"
+#define GEANY_WORDCHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
#define GEANY_MAX_WORD_LENGTH 192
#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
#define GEANY_MAX_AUTOCOMPLETE_HEIGHT 10
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2006-11-22 23:10:18 UTC (rev 1019)
+++ trunk/src/highlighting.c 2006-11-23 11:42:10 UTC (rev 1020)
@@ -162,14 +162,13 @@
}
-static void get_keyfile_wordchars(GKeyFile *config, GKeyFile *configh,
- const gchar *default_value, gchar **wordchars)
+static void get_keyfile_wordchars(GKeyFile *config, GKeyFile *configh, gchar **wordchars)
{
gchar *result;
if (config == NULL || configh == NULL)
{
- *wordchars = g_strdup(default_value);
+ *wordchars = g_strdup(GEANY_WORDCHARS);
return;
}
@@ -178,7 +177,7 @@
if (result == NULL)
{
- *wordchars = g_strdup(default_value);
+ *wordchars = g_strdup(GEANY_WORDCHARS);
}
else
*wordchars = result;
@@ -404,7 +403,7 @@
common_style_set.folding_style.draw_line = tmp_style.foreground;
}
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, &common_style_set.wordchars);
+ get_keyfile_wordchars(config, config_home, &common_style_set.wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_ALL);
g_key_file_free(config);
@@ -632,7 +631,7 @@
get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_C, 1, "TODO FIXME");
style_sets[GEANY_FILETYPES_C].keywords[2] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_C].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_C);
@@ -720,7 +719,7 @@
get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CPP, 1, "TODO FIXME");
style_sets[GEANY_FILETYPES_CPP].keywords[2] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_CPP].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_CPP);
@@ -820,7 +819,7 @@
asm unit interface implementation procedure function object try class");
style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_PASCAL].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_PASCAL);
@@ -880,7 +879,7 @@
style_sets[GEANY_FILETYPES_MAKE].keywords = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_MAKE].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_MAKE);
@@ -926,7 +925,7 @@
style_sets[GEANY_FILETYPES_DIFF].keywords = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_DIFF].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_DIFF);
@@ -973,7 +972,7 @@
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item");
style_sets[GEANY_FILETYPES_LATEX].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_LATEX].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_LATEX);
@@ -1014,7 +1013,7 @@
style_sets[GEANY_FILETYPES_PHP].styling = NULL;
style_sets[GEANY_FILETYPES_PHP].keywords = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_PHP].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_PHP);
@@ -1054,7 +1053,7 @@
style_sets[GEANY_FILETYPES_HTML].styling = NULL;
style_sets[GEANY_FILETYPES_HTML].keywords = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_HTML].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_HTML);
@@ -1159,7 +1158,7 @@
get_keyfile_keywords(config, config_home, "keywords", "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION");
style_sets[GEANY_FILETYPES_XML].keywords[6] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS"$",
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_XML].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_XML);
@@ -1413,7 +1412,7 @@
get_keyfile_keywords(config, config_home, "keywords", "typedefs", GEANY_FILETYPES_JAVA, 3, "");
style_sets[GEANY_FILETYPES_JAVA].keywords[4] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_JAVA].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_JAVA);
@@ -1524,7 +1523,7 @@
x xor y");
style_sets[GEANY_FILETYPES_PERL].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_PERL].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_PERL);
@@ -1595,7 +1594,7 @@
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while yield");
style_sets[GEANY_FILETYPES_PYTHON].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_PYTHON].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_PYTHON);
@@ -1667,7 +1666,7 @@
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield");
style_sets[GEANY_FILETYPES_RUBY].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_RUBY].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_RUBY);
@@ -1733,7 +1732,7 @@
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while");
style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_SH].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_SH);
@@ -1882,7 +1881,7 @@
get_keyfile_keywords(config, config_home, "keywords", "dtd", GEANY_FILETYPES_DOCBOOK, 1, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION");
style_sets[GEANY_FILETYPES_DOCBOOK].keywords[2] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_DOCBOOK].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_DOCBOOK);
@@ -2007,7 +2006,7 @@
speak-punctuation speak-numeral");
style_sets[GEANY_FILETYPES_CSS].keywords[3] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_CSS].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_CSS);
@@ -2067,7 +2066,7 @@
style_sets[GEANY_FILETYPES_CONF].keywords = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_CONF].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_CONF);
@@ -2128,7 +2127,7 @@
get_keyfile_keywords(config, config_home, "keywords", "directives", GEANY_FILETYPES_ASM, 2, "ORG LIST NOLIST PAGE EQUIVALENT WORD TEXT");
style_sets[GEANY_FILETYPES_ASM].keywords[3] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_ASM].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_ASM);
@@ -2202,7 +2201,7 @@
get_keyfile_keywords(config, config_home, "keywords", "user_functions", GEANY_FILETYPES_FORTRAN, 2, "");
style_sets[GEANY_FILETYPES_FORTRAN].keywords[3] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_FORTRAN].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_FORTRAN);
@@ -2300,7 +2299,7 @@
value values varchar variable varying view when whenever where with without work write");
style_sets[GEANY_FILETYPES_SQL].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_SQL].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_SQL);
@@ -2373,7 +2372,7 @@
get_keyfile_keywords(config, config_home, "keywords", "keywords_optional", GEANY_FILETYPES_CAML, 1, "option Some None ignore ref");
style_sets[GEANY_FILETYPES_CAML].keywords[2] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_CAML].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_CAML);
@@ -2441,7 +2440,7 @@
addcontrol addcontrol delwin fillrows function gaspect conjdir");
style_sets[GEANY_FILETYPES_OMS].keywords[1] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_OMS].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_OMS);
@@ -2512,7 +2511,7 @@
get_keyfile_keywords(config, config_home, "keywords", "expand", GEANY_FILETYPES_TCL, 4, "");
style_sets[GEANY_FILETYPES_TCL].keywords[5] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_TCL].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_TCL);
@@ -2569,7 +2568,7 @@
get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_D, 1, "TODO FIXME");
style_sets[GEANY_FILETYPES_D].keywords[2] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_D].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_D);
@@ -2650,7 +2649,7 @@
get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning");
style_sets[GEANY_FILETYPES_FERITE].keywords[3] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_FERITE].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_FERITE);
@@ -2760,7 +2759,7 @@
get_keyfile_keywords(config, config_home, "keywords", "userwords", GEANY_FILETYPES_VHDL, 6, "");
style_sets[GEANY_FILETYPES_VHDL].keywords[7] = NULL;
- get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS,
+ get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_VHDL].wordchars);
filetypes_get_config(config, config_home, GEANY_FILETYPES_VHDL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list