SF.net SVN: geany:[4397] trunk

[ntrel at users.sourceforge.net]

Revision: 4397
          http://geany.svn.sourceforge.net/geany/?rev=4397&view=rev
Author:   ntrel
Date:     2009-11-04 14:59:16 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Fix issue with default color not being reset if overridden with a
system default color.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-04 14:47:07 UTC (rev 4396)
+++ trunk/ChangeLog	2009-11-04 14:59:16 UTC (rev 4397)
@@ -8,6 +8,9 @@
    section is read.
  * src/templates.c, src/utils.c, src/highlighting.c, src/utils.h:
    Add utils_get_config_files().
+ * src/highlighting.c:
+   Fix issue with default color not being reset if overridden with a
+   system default color.
 
 
 2009-10-30  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-11-04 14:47:07 UTC (rev 4396)
+++ trunk/src/highlighting.c	2009-11-04 14:59:16 UTC (rev 4397)
@@ -545,6 +545,7 @@
 	}
 	/* first set default to the "default" named style */
 	add_named_style(config, "default");
+	read_named_style("default", &gsd_default);	/* in case user overrides but not with both colors */
 	add_named_style(config_home, "default");
 	read_named_style("default", &gsd_default);
 


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