Add underscore to default wordchars again (oops).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1023 ea778897-0a13-0410-b9d1-a72fbfd435f5
geany · Nov 23, 2006 · fa9decd · fa9decd
1 parent 76931fe
commit fa9decd
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 27 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -13,6 +13,8 @@
  * src/keybindings.c:
    Add switching to a notebook tab number using Alt-1 to Alt-9; Alt-0
    switches to the last tab.
+ * src/geany.h, data/filetypes.*:
+   Add underscore to default wordchars again (oops).
 
 
 2006-11-22  Frank Lanitz  <frank@frank.uvena.de>

diff --git a/data/filetypes.asm b/data/filetypes.asm
@@ -27,7 +27,7 @@ directives=org list nolist page equivalent word text
 
 [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=;

diff --git a/data/filetypes.c b/data/filetypes.c
@@ -31,7 +31,7 @@ docComment=TODO FIXME
 
 [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=//

diff --git a/data/filetypes.caml b/data/filetypes.caml
@@ -24,7 +24,7 @@ keywords_optional=option Some None ignore ref
 
 [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=(*

diff --git a/data/filetypes.conf b/data/filetypes.conf
@@ -13,7 +13,7 @@ defval=0x00007f;0xffffff;false;false
 
 [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=#

diff --git a/data/filetypes.cpp b/data/filetypes.cpp
@@ -31,7 +31,7 @@ docComment=TODO FIXME
 
 [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=//

diff --git a/data/filetypes.css b/data/filetypes.css
@@ -26,7 +26,7 @@ pseudoclasses=first-letter first-line link active visited lang first-child focus
 
 [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=/*

diff --git a/data/filetypes.d b/data/filetypes.d
@@ -31,7 +31,7 @@ docComment=TODO FIXME
 
 [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=//

diff --git a/data/filetypes.diff b/data/filetypes.diff
@@ -12,7 +12,7 @@ added=0x34b034;0xffffff;false;false
 
 [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=

diff --git a/data/filetypes.docbook b/data/filetypes.docbook
@@ -39,7 +39,7 @@ dtd=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
 
 [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=<!--

diff --git a/data/filetypes.ferite b/data/filetypes.ferite
@@ -29,7 +29,7 @@ docComment=brief class declaration description end example extends function grou
 
 [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=//

diff --git a/data/filetypes.fortran b/data/filetypes.fortran
@@ -28,7 +28,7 @@ user_functions=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand dcmplx dconjg d
 
 [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

diff --git a/data/filetypes.html b/data/filetypes.html
@@ -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

diff --git a/data/filetypes.java b/data/filetypes.java
@@ -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=/*

diff --git a/data/filetypes.latex b/data/filetypes.latex
@@ -14,7 +14,7 @@ primary=above abovedisplayshortskip abovedisplayskip abovewithdelims accent adjd
 
 [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=%

diff --git a/data/filetypes.makefile b/data/filetypes.makefile
@@ -14,7 +14,7 @@ ideol=0x008000;0xffffff;false;false
 
 [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=#

diff --git a/data/filetypes.oms b/data/filetypes.oms
@@ -20,7 +20,7 @@ primary=clear seq fillcols fillrowsgaspect gaddview gtitle gxaxis gyaxis max con
 
 [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=#

diff --git a/data/filetypes.pascal b/data/filetypes.pascal
@@ -20,7 +20,7 @@ primary=absolute and array asm begin break case const constructor continue destr
 
 [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={

diff --git a/data/filetypes.perl b/data/filetypes.perl
@@ -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=#

diff --git a/data/filetypes.php b/data/filetypes.php
@@ -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

diff --git a/data/filetypes.python b/data/filetypes.python
@@ -23,7 +23,7 @@ primary=and assert break class continue def del elif else except exec finally fo
 
 [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=#

diff --git a/data/filetypes.ruby b/data/filetypes.ruby
@@ -28,7 +28,7 @@ primary=__FILE__ load define_method attr_accessor attr_writer attr_reader and de
 
 [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=#

diff --git a/data/filetypes.sh b/data/filetypes.sh
@@ -19,7 +19,7 @@ primary=break case continue do done elif else esac eval exit export fi for funct
 
 [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=#

diff --git a/data/filetypes.sql b/data/filetypes.sql
@@ -24,7 +24,7 @@ keywords=absolute action add admin after aggregate alias all allocate alter and
 
 [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=/*

diff --git a/data/filetypes.tcl b/data/filetypes.tcl
@@ -30,7 +30,7 @@ expand=
 
 [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=#

diff --git a/data/filetypes.vhdl b/data/filetypes.vhdl
@@ -29,7 +29,7 @@ userwords=
 
 [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=--

diff --git a/data/filetypes.xml b/data/filetypes.xml
@@ -76,7 +76,7 @@ sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
 
 [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=<!--

diff --git a/src/geany.h b/src/geany.h
@@ -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