SF.net SVN: geany: [2006] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Thu Nov 1 16:33:07 UTC 2007


Revision: 2006
          http://geany.svn.sourceforge.net/geany/?rev=2006&view=rev
Author:   ntrel
Date:     2007-11-01 09:33:06 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Add configurable default file extension setting for filetype
definition files.
Note: There is a bug with using the default extension, not the user
set one, if 'New with template' is used before any documents of the
same filetype are open.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.asm
    trunk/data/filetypes.c
    trunk/data/filetypes.caml
    trunk/data/filetypes.conf
    trunk/data/filetypes.cpp
    trunk/data/filetypes.cs
    trunk/data/filetypes.css
    trunk/data/filetypes.d
    trunk/data/filetypes.diff
    trunk/data/filetypes.docbook
    trunk/data/filetypes.ferite
    trunk/data/filetypes.fortran
    trunk/data/filetypes.freebasic
    trunk/data/filetypes.haskell
    trunk/data/filetypes.haxe
    trunk/data/filetypes.html
    trunk/data/filetypes.java
    trunk/data/filetypes.javascript
    trunk/data/filetypes.latex
    trunk/data/filetypes.lua
    trunk/data/filetypes.makefile
    trunk/data/filetypes.oms
    trunk/data/filetypes.pascal
    trunk/data/filetypes.perl
    trunk/data/filetypes.php
    trunk/data/filetypes.python
    trunk/data/filetypes.ruby
    trunk/data/filetypes.sh
    trunk/data/filetypes.sql
    trunk/data/filetypes.tcl
    trunk/data/filetypes.vhdl
    trunk/data/filetypes.xml
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/ChangeLog	2007-11-01 16:33:06 UTC (rev 2006)
@@ -7,6 +7,12 @@
  * src/document.c:
    Ensure document_update_tag_list() always shows the empty symbol list
    when tags cannot be parsed.
+ * src/filetypes.c, doc/geany.txt, doc/geany.html, data/filetypes.*:
+   Add configurable default file extension setting for filetype
+   definition files.
+   Note: There is a bug with using the default extension, not the user
+   set one, if 'New with template' is used before any documents of the
+   same filetype are open.
 
 
 2007-11-01  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/data/filetypes.asm
===================================================================
--- trunk/data/filetypes.asm	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.asm	2007-11-01 16:33:06 UTC (rev 2006)
@@ -26,6 +26,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=asm
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.c
===================================================================
--- trunk/data/filetypes.c	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.c	2007-11-01 16:33:06 UTC (rev 2006)
@@ -33,6 +33,9 @@
 docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
 
 [settings]
+# default extension used when saving files
+#extension=c
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.caml
===================================================================
--- trunk/data/filetypes.caml	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.caml	2007-11-01 16:33:06 UTC (rev 2006)
@@ -23,6 +23,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=ml
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.conf
===================================================================
--- trunk/data/filetypes.conf	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.conf	2007-11-01 16:33:06 UTC (rev 2006)
@@ -12,6 +12,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=conf
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.cpp
===================================================================
--- trunk/data/filetypes.cpp	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.cpp	2007-11-01 16:33:06 UTC (rev 2006)
@@ -33,6 +33,9 @@
 docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
 
 [settings]
+# default extension used when saving files
+#extension=cpp
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.cs
===================================================================
--- trunk/data/filetypes.cs	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.cs	2007-11-01 16:33:06 UTC (rev 2006)
@@ -33,6 +33,9 @@
 docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
 
 [settings]
+# default extension used when saving files
+#extension=cs
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.css
===================================================================
--- trunk/data/filetypes.css	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.css	2007-11-01 16:33:06 UTC (rev 2006)
@@ -25,6 +25,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=css
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.d
===================================================================
--- trunk/data/filetypes.d	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.d	2007-11-01 16:33:06 UTC (rev 2006)
@@ -29,6 +29,9 @@
 types=
 
 [settings]
+# default extension used when saving files
+#extension=d
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.diff
===================================================================
--- trunk/data/filetypes.diff	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.diff	2007-11-01 16:33:06 UTC (rev 2006)
@@ -11,6 +11,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=diff
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.docbook
===================================================================
--- trunk/data/filetypes.docbook	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.docbook	2007-11-01 16:33:06 UTC (rev 2006)
@@ -38,6 +38,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=docbook
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.ferite
===================================================================
--- trunk/data/filetypes.ferite	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.ferite	2007-11-01 16:33:06 UTC (rev 2006)
@@ -29,6 +29,9 @@
 docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning
 
 [settings]
+# default extension used when saving files
+#extension=fe
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.fortran
===================================================================
--- trunk/data/filetypes.fortran	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.fortran	2007-11-01 16:33:06 UTC (rev 2006)
@@ -27,6 +27,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=f
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.freebasic
===================================================================
--- trunk/data/filetypes.freebasic	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.freebasic	2007-11-01 16:33:06 UTC (rev 2006)
@@ -31,6 +31,9 @@
 user2=
 
 [settings]
+# default extension used when saving files
+#extension=bas
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.haskell
===================================================================
--- trunk/data/filetypes.haskell	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.haskell	2007-11-01 16:33:06 UTC (rev 2006)
@@ -25,6 +25,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=hs
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.haxe
===================================================================
--- trunk/data/filetypes.haxe	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.haxe	2007-11-01 16:33:06 UTC (rev 2006)
@@ -30,6 +30,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=hx
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.html
===================================================================
--- trunk/data/filetypes.html	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.html	2007-11-01 16:33:06 UTC (rev 2006)
@@ -4,6 +4,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=html
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.java
===================================================================
--- trunk/data/filetypes.java	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.java	2007-11-01 16:33:06 UTC (rev 2006)
@@ -31,6 +31,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=java
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.javascript
===================================================================
--- trunk/data/filetypes.javascript	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.javascript	2007-11-01 16:33:06 UTC (rev 2006)
@@ -27,6 +27,9 @@
 primary=abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends final finally float for function goto if implements import in instanceof int interface long native new package private protected public return short static super switch synchronized this throw throws transient try typeof var void volatile while with
 
 [settings]
+# default extension used when saving files
+#extension=js
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.latex
===================================================================
--- trunk/data/filetypes.latex	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.latex	2007-11-01 16:33:06 UTC (rev 2006)
@@ -13,6 +13,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=tex
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.lua
===================================================================
--- trunk/data/filetypes.lua	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.lua	2007-11-01 16:33:06 UTC (rev 2006)
@@ -38,6 +38,9 @@
 user4=
 
 [settings]
+# default extension used when saving files
+#extension=lua
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.makefile
===================================================================
--- trunk/data/filetypes.makefile	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.makefile	2007-11-01 16:33:06 UTC (rev 2006)
@@ -13,6 +13,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=mak
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.oms
===================================================================
--- trunk/data/filetypes.oms	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.oms	2007-11-01 16:33:06 UTC (rev 2006)
@@ -19,6 +19,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=oms
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.pascal
===================================================================
--- trunk/data/filetypes.pascal	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.pascal	2007-11-01 16:33:06 UTC (rev 2006)
@@ -19,6 +19,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=pas
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.perl
===================================================================
--- trunk/data/filetypes.perl	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.perl	2007-11-01 16:33:06 UTC (rev 2006)
@@ -37,6 +37,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=pl
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.php
===================================================================
--- trunk/data/filetypes.php	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.php	2007-11-01 16:33:06 UTC (rev 2006)
@@ -4,6 +4,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=php
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.python
===================================================================
--- trunk/data/filetypes.python	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.python	2007-11-01 16:33:06 UTC (rev 2006)
@@ -24,6 +24,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=py
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.ruby
===================================================================
--- trunk/data/filetypes.ruby	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.ruby	2007-11-01 16:33:06 UTC (rev 2006)
@@ -41,6 +41,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=rb
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.sh
===================================================================
--- trunk/data/filetypes.sh	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.sh	2007-11-01 16:33:06 UTC (rev 2006)
@@ -18,6 +18,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=sh
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.sql
===================================================================
--- trunk/data/filetypes.sql	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.sql	2007-11-01 16:33:06 UTC (rev 2006)
@@ -23,6 +23,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=sql
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.tcl
===================================================================
--- trunk/data/filetypes.tcl	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.tcl	2007-11-01 16:33:06 UTC (rev 2006)
@@ -29,6 +29,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=tcl
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.vhdl
===================================================================
--- trunk/data/filetypes.vhdl	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.vhdl	2007-11-01 16:33:06 UTC (rev 2006)
@@ -28,6 +28,9 @@
 userwords=
 
 [settings]
+# default extension used when saving files
+#extension=vhd
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/data/filetypes.xml
===================================================================
--- trunk/data/filetypes.xml	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/data/filetypes.xml	2007-11-01 16:33:06 UTC (rev 2006)
@@ -75,6 +75,9 @@
 
 
 [settings]
+# default extension used when saving files
+#extension=xml
+
 # the following characters are these which a "word" can contains, see documentation
 #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
 

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/doc/geany.html	2007-11-01 16:33:06 UTC (rev 2006)
@@ -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="2007-10-19" />
+<meta name="date" content="2007-10-28" />
 <style type="text/css">
 
 /*
@@ -133,7 +133,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2007-10-19</td></tr>
+<td>2007-10-28</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.13</td></tr>
 </tbody>
@@ -1321,10 +1321,12 @@
 <p>You can set an optional description for the project, but it is not
 used elsewhere by Geany.</p>
 <p>The <em>Base path</em> field is used as the directory to run the Make and Make
-custom commands in.</p>
+custom commands in. It is also used as working directory for the project
+specific <em>Run command</em>.
+The specified path can be absolute or relative to the project's file name.</p>
 <div class="section">
 <h4><a class="toc-backref" href="#id65" id="run-command" name="run-command">Run command</a></h4>
-<p>The Run command overrides the default run command. You can set this
+<p>The <em>Run command</em> overrides the default run command. You can set this
 to the executable or main script file for the project, and append
 any command-line arguments.</p>
 <p>The following variables can be used:</p>
@@ -2003,6 +2005,13 @@
 <div class="section">
 <h4><a class="toc-backref" href="#id91" id="settings-section" name="settings-section">[settings] Section</a></h4>
 <dl class="docutils">
+<dt>extension</dt>
+<dd><p class="first">This is the default file extension used when saving files, not
+including the period character (<tt class="docutils literal"><span class="pre">.</span></tt>). The extension used should
+match one of the patterns associated with that filetype (see
+<a class="reference" href="#filetype-extensions">Filetype extensions</a>).</p>
+<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">extension=cxx</span></tt></p>
+</dd>
 <dt>wordchars</dt>
 <dd><p class="first">These characters define word boundaries when making selections
 and searching using word matching options.</p>
@@ -2199,7 +2208,9 @@
 </div>
 <div class="section">
 <h2><a class="toc-backref" href="#id94" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2>
-<p>You can override the default extensions that Geany uses for each
+<p>To change the default filetype extension used when saving a new file,
+see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p>
+<p>You can override the list of file extensions that Geany uses for each
 filetype using the <tt class="docutils literal"><span class="pre">filetype_extensions.conf</span></tt> file.</p>
 <p>To override the system-wide configuration file, copy it from
 <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt> to your configuration directory, usually
@@ -3096,7 +3107,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-10-22 12:32 UTC.
+Generated on: 2007-11-01 16:20 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	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/doc/geany.txt	2007-11-01 16:33:06 UTC (rev 2006)
@@ -1810,6 +1810,14 @@
 [settings] Section
 ``````````````````
 
+extension
+    This is the default file extension used when saving files, not
+    including the period character (``.``). The extension used should
+    match one of the patterns associated with that filetype (see
+    `Filetype extensions`_).
+
+    *Example:* ``extension=cxx``
+
 wordchars
     These characters define word boundaries when making selections
     and searching using word matching options.
@@ -2031,7 +2039,10 @@
 Filetype extensions
 -------------------
 
-You can override the default extensions that Geany uses for each
+To change the default filetype extension used when saving a new file,
+see `Filetype definition files`_.
+
+You can override the list of file extensions that Geany uses for each
 filetype using the ``filetype_extensions.conf`` file.
 
 To override the system-wide configuration file, copy it from

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2007-11-01 16:15:48 UTC (rev 2005)
+++ trunk/src/filetypes.c	2007-11-01 16:33:06 UTC (rev 2006)
@@ -795,6 +795,14 @@
 
 	if (config == NULL || configh == NULL || ft < 0 || ft >= GEANY_MAX_FILE_TYPES) return;
 
+	// default extension
+	result = g_key_file_get_string(configh, "settings", "extension", NULL);
+	if (result == NULL) result = g_key_file_get_string(config, "settings", "extension", NULL);
+	if (result != NULL)
+	{
+		setptr(filetypes[ft]->extension, result);
+	}
+
 	// read comment notes
 	result = g_key_file_get_string(configh, "settings", "comment_open", NULL);
 	if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_open", NULL);


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



More information about the Commits mailing list