Revision: 2854
http://geany.svn.sourceforge.net/geany/?rev=2854&view=rev
Author: ntrel
Date: 2008-08-04 14:10:16 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Implemented 'distinguish between tab width vs. indent width'.
Modified Paths:
--------------
branches/custom-tab-width/TODO
Modified: branches/custom-tab-width/TODO
===================================================================
--- branches/custom-tab-width/TODO 2008-08-04 14:07:49 UTC (rev 2853)
+++ branches/custom-tab-width/TODO 2008-08-04 14:10:16 UTC (rev 2854)
@@ -18,9 +18,6 @@
o recent projects menu
o project indentation settings support
o improve Compile toolbar button for Make (drop down radio list?)
- o (for spaces indentation, distinguish between tab width vs. indent
- width, e.g. GTK code uses indent width of 2 spaces, and any tabs are
- worth 8 spaces.)
o (selectable menu of arguments to use for Make, from Make Custom)
o (DBUS)
o (indent wrapped lines - Scintilla issue)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2850
http://geany.svn.sourceforge.net/geany/?rev=2850&view=rev
Author: eht16
Date: 2008-08-01 15:56:37 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Add some keywords for filetype SQL (patch by Felipe Pena, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.sql
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-01 15:55:20 UTC (rev 2849)
+++ trunk/ChangeLog 2008-08-01 15:56:37 UTC (rev 2850)
@@ -4,6 +4,8 @@
Revert r2843 because it messed it Ctrl-C/SIGINT in the VTE.
* src/vte.c:
Initialise the VTE pid var with 0 just for safety.
+ * src/highlighting.c, data/filetypes.sql:
+ Add some keywords for filetype SQL (patch by Felipe Pena, thanks).
2008-07-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/data/filetypes.sql
===================================================================
--- trunk/data/filetypes.sql 2008-08-01 15:55:20 UTC (rev 2849)
+++ trunk/data/filetypes.sql 2008-08-01 15:56:37 UTC (rev 2850)
@@ -19,7 +19,7 @@
[keywords]
# all items must be in one line
-keywords=absolute action add admin after aggregate alias all allocate alter and any are array as asc assertion at authorization before begin binary bit blob boolean both breadth by call cascade cascaded case cast catalog char character check class clob close collate collation column commit completion connect connection constraint constraints constructor continue corresponding create cross cube current current_date current_path current_role current_time current_timestamp current_user cursor cycle data date day deallocate dec decimal declare default deferrable deferred delete depth deref desc describe descriptor destroy destructor deterministic dictionary diagnostics disconnect distinct domain double drop dynamic each else end end-exec equals escape every except exception exec execute external false fetch first float for foreign found from free full function general get global go goto grant group grouping having host hour identity if ignore immediate in indicator initialize initially inner inout input insert int integer intersect interval into is isolation iterate join key language large last lateral leading left less level like limit local localtime localtimestamp locator map match minute modifies modify module month names national natural nchar nclob new next no none not null numeric object of off old on only open operation option or order ordinality out outer output pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary prior privileges procedure public read reads real recursive ref references referencing relative restrict result return returns revoke right role rollback rollup routine row rows savepoint schema scroll scope search second section select sequence session session_user set sets size smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static structure system_user table temporary terminate than then time timestamp timezone_hour timezone_minute to trailing transaction translation treat trigger true under union unique unknown unnest update usage user using value values varchar variable varying view when whenever where with without work write year zone
+keywords=absolute action add admin after aggregate alias all allocate alter and any are array as asc assertion at authorization before begin bfile bigint binary bit blob bool boolean both breadth by call cascade cascaded case cast catalog char character check class clob close cluster collate collation column commit completion connect connection constraint constraints constructor continue corresponding create cross cube current current_date current_path current_role current_time current_timestamp current_user cursor cycle data date day deallocate dec decimal declare default deferrable deferred delete depth deref desc describe descriptor destroy destructor deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic each else end end-exec equals escape every except exception exec execute exists explain external false fetch first fixed flashback float for foreign found from free full function general get global go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator initialize initially inner inout input insert int integer intersect interval into is isolation iterate join key language large last lateral leading left less level like limit local localtime localtimestamp locator long map match materialized mediumblob mediumint mediumtext merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer output package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary prior privileges procedure profile public purge read reads real recursive ref references referencing regexp regexp_like relative rename restrict result return returning returns revoke right role rollback rollup routine row rows savepoint schema scroll scope search second section select sequence session session_user set sets size smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static structure synonym system_user table tablespace temporary terminate than then time timestamp timezone_hour timezone_minute tinyint to trailing transaction translation treat trigger true truncate type under union unique unknown unnest update usage user using value values varchar varchar2 variable varying view when whenever where with without work write year zone
[settings]
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2008-08-01 15:55:20 UTC (rev 2849)
+++ trunk/src/highlighting.c 2008-08-01 15:56:37 UTC (rev 2850)
@@ -2140,31 +2140,31 @@
get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_SQL, 0,
"absolute action add admin after aggregate \
alias all allocate alter and any are array as asc \
- assertion at authorization before begin binary bit blob boolean both breadth by \
- call cascade cascaded case cast catalog char character check class clob close collate \
+ assertion at authorization before begin bfile bigint binary bit blob bool boolean both breadth by \
+ call cascade cascaded case cast catalog char character check class clob close cluster collate \
collation column commit completion connect connection constraint constraints \
constructor continue corresponding create cross cube current \
current_date current_path current_role current_time current_timestamp \
current_user cursor cycle data date day deallocate dec decimal declare default \
deferrable deferred delete depth deref desc describe descriptor destroy destructor \
- deterministic dictionary diagnostics disconnect distinct domain double drop dynamic \
- each else end end-exec equals escape every except exception exec execute external \
- false fetch first float for foreign found from free full function general get global \
- go goto grant group grouping having host hour identity if ignore immediate in indicator \
+ deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic \
+ each else end end-exec equals escape every except exception exec execute exists explain external \
+ false fetch first fixed flashback float for foreign found from free full function general get global \
+ go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator \
initialize initially inner inout input insert int integer intersect interval \
into is isolation iterate join key language large last lateral leading left less level like \
- limit local localtime localtimestamp locator map match minute modifies modify module month \
- names national natural nchar nclob new next no none not null numeric object of off old on only \
- open operation option or order ordinality out outer output pad parameter parameters partial path \
- postfix precision prefix preorder prepare preserve primary prior privileges procedure public \
- read reads real recursive ref references referencing relative restrict result return returns \
- revoke right role rollback rollup routine row rows savepoint schema scroll scope search \
- second section select sequence session session_user set sets size smallint some space \
- specific specifictype sql sqlexception sqlstate sqlwarning start state statement static \
- structure system_user table temporary terminate than then time timestamp \
- timezone_hour timezone_minute to trailing transaction translation year zone\
- treat trigger true under union unique unknown unnest update usage user using \
- value values varchar variable varying view when whenever where with without work write");
+ limit local localtime localtimestamp locator long map match materialized mediumblob mediumint mediumtext \
+ merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit \
+ none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer \
+ output package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary \
+ prior privileges procedure profile public purge read reads real recursive ref references referencing regexp regexp_like \
+ relative rename restrict result return returning returns revoke right role rollback rollup routine row rows \
+ savepoint schema scroll scope search second section select sequence session session_user set sets size \
+ smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static \
+ structure synonym system_user table tablespace temporary terminate than then time timestamp \
+ timezone_hour timezone_minute tinyint to trailing transaction translation treat trigger true truncate \
+ type under union unique unknown unnest update usage user using value values varchar varchar2 variable varying \
+ view when whenever where with without work write year zone");
style_sets[GEANY_FILETYPES_SQL].keywords[1] = NULL;
get_keyfile_wordchars(config, config_home,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2846
http://geany.svn.sourceforge.net/geany/?rev=2846&view=rev
Author: eht16
Date: 2008-08-01 15:52:42 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Add four new PHP 5.3 keywords (patch by Felipe Pena, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.xml
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-01 15:51:30 UTC (rev 2845)
+++ trunk/ChangeLog 2008-08-01 15:52:42 UTC (rev 2846)
@@ -13,6 +13,8 @@
* src/about.c, THANKS:
Add a list of contributors to the About dialog.
Update the THANKS file.
+ * src/highlighting.c, data/filetypes.php:
+ Add four new PHP 5.3 keywords (patch by Felipe Pena, thanks).
2008-07-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/data/filetypes.xml
===================================================================
--- trunk/data/filetypes.xml 2008-08-01 15:51:30 UTC (rev 2845)
+++ trunk/data/filetypes.xml 2008-08-01 15:52:42 UTC (rev 2846)
@@ -75,7 +75,7 @@
javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with
vbscript=and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant
python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list
-php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function global if implements include include_once int integer interface isset __line__ list __method__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor
+php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor
sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2008-08-01 15:51:30 UTC (rev 2845)
+++ trunk/src/highlighting.c 2008-08-01 15:52:42 UTC (rev 2846)
@@ -1099,7 +1099,7 @@
get_keyfile_keywords(config, config_home, "keywords", "javascript", GEANY_FILETYPES_XML, 1, "abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with");
get_keyfile_keywords(config, config_home, "keywords", "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant");
get_keyfile_keywords(config, config_home, "keywords", "python", GEANY_FILETYPES_XML, 3, "and as 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 with yield False None True");
- get_keyfile_keywords(config, config_home, "keywords", "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function global if implements include include_once int integer interface isset __line__ list __method__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor");
+ get_keyfile_keywords(config, config_home, "keywords", "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor");
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.