From 31571a39cf57c01bfa2a1e2e3e556a9773a29b19 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 5 May 2010 13:06:53 +0000
Subject: [PATCH] Add {project}, {description} template wildcards (#2954737).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4874 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog       |  2 ++
 doc/geany.html  | 14 +++++++++++---
 doc/geany.txt   |  4 ++++
 src/templates.c |  3 +++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25d815c15..78219d6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    Fix replacing {filename} template wildcard for custom file
    templates with non-default file extension.
    Add search_find_text() for POSIX regex searches.
+ * src/templates.c, doc/geany.txt, doc/geany.html:
+   Add {project}, {description} template wildcards (#2954737).
 
 
 2010-05-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/doc/geany.html b/doc/geany.html
index 14a46ea15..510b3610c 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -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="2010-04-28" />
+<meta name="date" content="2010-05-05" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2010-04-28</td></tr>
+<td>2010-05-05</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.19</td></tr>
 </tbody>
@@ -4980,6 +4980,14 @@ the first 3 lines of the file.</td>
 <td>file header, snippets, file
 templates.</td>
 </tr>
+<tr><td>project</td>
+<td>The current project's name, if any.</td>
+<td>file header, snippets, file templates.</td>
+</tr>
+<tr><td>description</td>
+<td>The current project's description, if any.</td>
+<td>file header, snippets, file templates.</td>
+</tr>
 <tr><td>gpl</td>
 <td>This wildcard inserts a short GPL notice.</td>
 <td>file header.</td>
@@ -6011,7 +6019,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-05-05 12:43 UTC.
+Generated on: 2010-05-05 13:02 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>
diff --git a/doc/geany.txt b/doc/geany.txt
index e2347a646..4c9016c40 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -4286,6 +4286,10 @@ filename       The filename of the current file.             file header, snippe
                Only replaced when first saving if found on   templates.
                the first 3 lines of the file.
 
+project        The current project's name, if any.           file header, snippets, file templates.
+
+description    The current project's description, if any.    file header, snippets, file templates.
+
 gpl            This wildcard inserts a short GPL notice.     file header.
 
 bsd            This wildcard inserts a BSD licence notice.   file header.
diff --git a/src/templates.c b/src/templates.c
index 9977362b7..dd39b427e 100644
--- a/src/templates.c
+++ b/src/templates.c
@@ -39,6 +39,7 @@
 #include "ui_utils.h"
 #include "toolbar.h"
 #include "geanymenubuttonaction.h"
+#include "project.h"
 
 
 GeanyTemplatePrefs template_prefs;
@@ -307,6 +308,8 @@ void templates_replace_common(GString *template, const gchar *fname,
 
 	templates_replace_valist(template,
 		"{filename}", shortname,
+		"{project}", app->project ? app->project->name : "",
+		"{description}", app->project ? app->project->description : "",
 		NULL);
 	g_free(shortname);
 
-- 
2.11.4.GIT