SF.net SVN: geany:[4471] trunk

[ntrel at users.sourceforge.net]

Revision: 4471
          http://geany.svn.sourceforge.net/geany/?rev=4471&view=rev
Author:   ntrel
Date:     2009-12-07 14:12:40 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
Add debug message warning if recursive lexer_filetype is set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-07 13:50:23 UTC (rev 4470)
+++ trunk/ChangeLog	2009-12-07 14:12:40 UTC (rev 4471)
@@ -2,6 +2,8 @@
 
  * src/highlighting.c:
    Highlight D & Java types from a global tags file.
+ * src/highlighting.c, doc/geany.txt, doc/geany.html:
+   Add debug message warning if recursive lexer_filetype is set.
 
 
 2009-12-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2009-12-07 13:50:23 UTC (rev 4470)
+++ trunk/doc/geany.html	2009-12-07 14:12:40 UTC (rev 4471)
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2009-11-29" />
+<meta name="date" content="2009-12-02" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2009-11-29</td></tr>
+<td>2009-12-02</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.19</td></tr>
 </tbody>
@@ -4193,7 +4193,9 @@
 <dt>tag_parser</dt>
 <dd>The TagManager language name, e.g. "C".</dd>
 <dt>lexer_filetype</dt>
-<dd>A filetype name to setup syntax highlighting from another filetype.</dd>
+<dd>A filetype name to setup syntax highlighting from another filetype.
+This must not be recursive, i.e. it should be a filetype name that
+doesn't use the lexer_filetype key itself.</dd>
 </dl>
 </div>
 <div class="section">
@@ -5839,7 +5841,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2009-12-02 16:14 UTC.
+Generated on: 2009-12-07 14:11 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2009-12-07 13:50:23 UTC (rev 4470)
+++ trunk/doc/geany.txt	2009-12-07 14:12:40 UTC (rev 4471)
@@ -3552,6 +3552,8 @@
 
 lexer_filetype
     A filetype name to setup syntax highlighting from another filetype.
+    This must not be recursive, i.e. it should be a filetype name that
+    doesn't use the lexer_filetype key itself.
 
 
 [build_settings] Section

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-12-07 13:50:23 UTC (rev 4470)
+++ trunk/src/highlighting.c	2009-12-07 14:12:40 UTC (rev 4471)
@@ -3186,6 +3186,9 @@
 		styleset_case(GEANY_FILETYPES_YAML,		styleset_yaml);
 		case GEANY_FILETYPES_NONE:
 		default:
+			if (ft->lexer_filetype)
+				geany_debug("Filetype %s has a recursive lexer_filetype %s set!",
+					ft->name, ft->lexer_filetype->name);
 			styleset_default(sci, ft->id);
 	}
 	/* [lexer_properties] settings */


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