diff --git a/ChangeLog b/ChangeLog index 8e1f68a7c..8208581f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 8170cd13b..e0a880af6 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,8 +7,10 @@ foreach (man_FILE ${man_FILES}) man/${man_FILE}) endforeach (man_FILE) -install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR} - FILES_MATCHING PATTERN "*.1") -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 (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR} + FILES_MATCHING PATTERN "*.1") +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}) diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp index 386f254de..40bf77043 100644 --- a/src/commands/CmdDenotate.cpp +++ b/src/commands/CmdDenotate.cpp @@ -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;