Merge branch '2.4.2' into lexer2

This commit is contained in:
Paul Beckingham 2015-03-07 17:36:10 -05:00
commit 29dff399bd
41 changed files with 1095 additions and 1472 deletions

View file

@ -433,7 +433,7 @@ std::string Config::_defaults =
"report.next.labels=ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg\n"
"report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.remaining,until.remaining,description,urgency\n"
"report.next.filter=status:pending limit:page\n"
"report.next.sort=start-,urgency-\n"
"report.next.sort=urgency-\n"
"\n"
"report.ready.description=Most urgent actionable tasks\n"
"report.ready.labels=ID,Active,Age,D,P,Project,Tags,R,S,Due,Until,Description,Urg\n"

View file

@ -358,6 +358,8 @@ void Hooks::onModify (const Task& before, Task& after)
throw 0; // This is how hooks silently terminate processing.
}
}
after = Task (input[1]);
}
context.timer_hooks.stop ();