Merge branch '2.0.0' of tasktools.org:task into 2.0.0

Conflicts:
	doc/ref/task-ref.pages
	doc/ref/task-ref.pdf
This commit is contained in:
Paul Beckingham 2011-10-06 22:58:10 -04:00
commit d0d2bba614
3 changed files with 10 additions and 5 deletions

View file

@ -203,6 +203,7 @@
description. They are now stripped (thanks to Aikido Guy).
+ Fixed bug #856, which prevented filters on missing project from working
(thanks to Michelle Crane).
+ Fixed bug #862, which suppressed feedback from the 'denotate' command.
# Untracked Bugs, biggest first.
+ Fixed bug that required the '%YAML' prologue in a YAML import.

View file

@ -12,3 +12,5 @@ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR}
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR}
FILES_MATCHING PATTERN "*.5")
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc DESTINATION ${TASK_DOCDIR})
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})

View file

@ -95,6 +95,7 @@ int CmdDenotate::execute (std::string& output)
if (i->second == pattern)
{
match = true;
anno = i->second;
annotations.erase (i);
task->setAnnotations (annotations);
break;
@ -107,6 +108,7 @@ int CmdDenotate::execute (std::string& output)
std::string::size_type loc = find (i->second, pattern, sensitive);
if (loc != std::string::npos)
{
anno = i->second;
annotations.erase (i);
task->setAnnotations (annotations);
break;