diff --git a/src/Context.cpp b/src/Context.cpp index a23c210ac..fbe1014e1 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -147,7 +147,7 @@ int Context::run () } // Dump all debug messages. - if (config.get ("debug", true)) + if (config.get (std::string ("debug"), false)) foreach (d, debugMessages) std::cout << colorizeDebug (*d) << std::endl; diff --git a/src/command.cpp b/src/command.cpp index b2181d10f..3f4e6c61e 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -968,8 +968,8 @@ void handleShell () { // Display some kind of welcome message. std::cout << ((context.config.get ("color", true) || context.config.get (std::string ("_forcecolor"), false)) - ? Text::colorize (Text::bold, Text::nocolor, PACKAGE) - : PACKAGE) + ? Text::colorize (Text::bold, Text::nocolor, PACKAGE_STRING) + : PACKAGE_STRING) << " shell" << std::endl << std::endl @@ -977,6 +977,8 @@ void handleShell () << std::endl << "There is no need to include the 'task' command itself." << std::endl + << "Enter 'quit' to end the session." + << std::endl << std::endl; // Preserve any special override arguments, and reapply them for each diff --git a/src/interactive.cpp b/src/interactive.cpp index eef5d7b70..701cfaf73 100644 --- a/src/interactive.cpp +++ b/src/interactive.cpp @@ -33,7 +33,7 @@ //#include "text.h" //#include "util.h" //#include "main.h" -//#include "i18n.h" +#include "i18n.h" #include "../auto.h" #ifdef HAVE_LIBNCURSES @@ -118,9 +118,9 @@ int Context::interactive () #else - throw stringtable (INTERACTIVE_NO_NCURSES, - "Interactive task is only available when built with ncurses " - "support."); + throw stringtable.get (INTERACTIVE_NO_NCURSES, + "Interactive task is only available when built with ncurses " + "support."); #endif }