SF.net SVN: geany:[4467] trunk

[ntrel at users.sourceforge.net]

Revision: 4467
          http://geany.svn.sourceforge.net/geany/?rev=4467&view=rev
Author:   ntrel
Date:     2009-12-03 16:08:06 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
Remove now unnecessary "styling_within_preprocessor" C style key.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.c
    trunk/data/filetypes.cpp
    trunk/data/filetypes.cs
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-03 13:43:37 UTC (rev 4466)
+++ trunk/ChangeLog	2009-12-03 16:08:06 UTC (rev 4467)
@@ -3,6 +3,9 @@
  * src/highlighting.c, data/filetypes.cpp, data/filetypes.vala,
    data/filetypes.glsl, data/filetypes.cs, data/filetypes.c:
    Move C-like filetype properties into configuration files.
+ * src/highlighting.c, data/filetypes.cpp, data/filetypes.cs,
+   data/filetypes.c:
+   Remove now unnecessary "styling_within_preprocessor" C style key.
 
 
 2009-12-02  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/data/filetypes.c
===================================================================
--- trunk/data/filetypes.c	2009-12-03 13:43:37 UTC (rev 4466)
+++ trunk/data/filetypes.c	2009-12-03 16:08:06 UTC (rev 4467)
@@ -23,9 +23,6 @@
 commentdockeyword=commentdoc,bold,italic
 commentdockeyworderror=commentdoc
 globalclass=type
-# whether arguments of preprocessor commands should be styled (only first argument is used)
-# 1 to enable, 0 to disable
-styling_within_preprocessor=1;0;false;false
 
 [keywords]
 # all items must be in one line

Modified: trunk/data/filetypes.cpp
===================================================================
--- trunk/data/filetypes.cpp	2009-12-03 13:43:37 UTC (rev 4466)
+++ trunk/data/filetypes.cpp	2009-12-03 16:08:06 UTC (rev 4467)
@@ -23,9 +23,6 @@
 commentdockeyword=commentdoc,bold,italic
 commentdockeyworderror=commentdoc
 globalclass=type
-# whether arguments of preprocessor commands should be styled (only first argument is used)
-# 1 to enable, 0 to disable
-styling_within_preprocessor=1;0;false;false
 
 [keywords]
 # all items must be in one line

Modified: trunk/data/filetypes.cs
===================================================================
--- trunk/data/filetypes.cs	2009-12-03 13:43:37 UTC (rev 4466)
+++ trunk/data/filetypes.cs	2009-12-03 16:08:06 UTC (rev 4467)
@@ -23,9 +23,6 @@
 commentdockeyword=commentdoc,bold,italic
 commentdockeyworderror=commentdoc
 globalclass=type
-# whether arguments of preprocessor commands should be styled (only first argument is used)
-# 1 to enable, 0 to disable
-styling_within_preprocessor=1;0;false;false
 
 [keywords]
 # all items must be in one line

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-12-03 13:43:37 UTC (rev 4466)
+++ trunk/src/highlighting.c	2009-12-03 16:08:06 UTC (rev 4467)
@@ -884,10 +884,8 @@
 		"globalclass"
 	};
 
-	new_styleset(filetype_idx, 21);
+	new_styleset(filetype_idx, G_N_ELEMENTS(entries));
 	load_style_entries(config, config_home, filetype_idx, entries, G_N_ELEMENTS(entries));
-	get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor",
-		1, 0, &style_sets[filetype_idx].styling[20]);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.