SF.net SVN: geany:[4644] trunk

[eht16 at users.sourceforge.net]

Revision: 4644
          http://geany.svn.sourceforge.net/geany/?rev=4644&view=rev
Author:   eht16
Date:     2010-02-06 17:25:58 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
When reloading configuration, process the current document at last so the symbol list will be updated correctly.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-06 17:24:43 UTC (rev 4643)
+++ trunk/ChangeLog	2010-02-06 17:25:58 UTC (rev 4644)
@@ -9,6 +9,9 @@
  * src/geanymenubuttonaction.c, src/templates.c:
    Unref the new files toolbar menu when setting a new menu to fix
    possible crashes when reloading configuration.
+ * src/filetypes.c:
+   When reloading configuration, process the current document at last
+   so the symbol list will be updated correctly.
 
 
 2010-02-01  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2010-02-06 17:24:43 UTC (rev 4643)
+++ trunk/src/filetypes.c	2010-02-06 17:25:58 UTC (rev 4644)
@@ -1624,6 +1624,7 @@
 void filetypes_reload(void)
 {
 	guint i;
+	GeanyDocument *current_doc;
 
 	/* save possibly changed commands before re-reading them */
 	filetypes_save_commands();
@@ -1635,8 +1636,14 @@
 		filetypes_load_config(i, TRUE);
 	}
 	/* update document styling */
+	current_doc = document_get_current();
 	foreach_document(i)
-		document_reload_config(documents[i]);
+	{
+		if (current_doc != documents[i])
+			document_reload_config(documents[i]);
+	}
+	/* process the current document at last */
+	document_reload_config(current_doc);
 }
 
 


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