From 2334911b344351e39b91c332f021a6016ff47ec8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Aug 2010 18:06:40 -0400
Subject: [PATCH] Bug #440 - Parser fails to simultaneously subst and append

- The code wasn't even trying to apply the substitutions for the
  append and prepend commands.
---
 ChangeLog       | 1 +
 src/command.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ba234dcce..5930236f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
  + Fixed bug #438, correcting the sorting of the entry_time, start_time
    and end_time columns (thanks to Michelle Crane).
  + Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
+ + Fixed bug #440, which prevented simultaneous append/prepend and substitution.
  + Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
    substitution (thanks to Michelle Crane).
  + Fixed bug #444, which made task shell unusable after canceling out of an
diff --git a/src/command.cpp b/src/command.cpp
index a04902eed..526e8f066 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1610,6 +1610,7 @@ int handleAppend (std::string &outs)
           changes += deltaAppend (*other);
           changes += deltaTags (*other);
           changes += deltaAttributes (*other);
+          changes += deltaSubstitutions (*other);
 
           if (taskDiff (before, *other))
           {
@@ -1686,6 +1687,7 @@ int handlePrepend (std::string &outs)
           changes += deltaPrepend (*other);
           changes += deltaTags (*other);
           changes += deltaAttributes (*other);
+          changes += deltaSubstitutions (*other);
 
           if (taskDiff (before, *other))
           {