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

This commit is contained in:
Paul Beckingham 2013-03-06 20:53:34 -05:00
commit 08b959aafc
5 changed files with 6 additions and 3 deletions

View file

@ -113,6 +113,8 @@ Bugs
+ Added missing localized confirmation strings (thanks to Rainer Müller).
+ Fixed bug that added an extra newline after setting the terminal title
(thanks to Rainer Müller).
+ Fixed a bug where the terminal title was tried to be set without a tty
(thanks to Rainer Müller).
------ old releases ------------------------------

View file

@ -243,7 +243,7 @@ be a visual mess. Beware!
The precedence for the color rules is determined by the configuration
variable 'rule.precedence.color', which by default contains:
due.today,active,blocked,overdue,due,keyword.,project.,tag.,recurring,pri.,tagged,completed,deleted
   due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
These are just the color rules with the 'color.' prefix removed. The
rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.

View file

@ -977,7 +977,7 @@ Colors the output of the merge command.
.RE
.TP
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri,tagged,completed,deleted
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
.RS
This setting specifies the precedence of the color rules, from highest to
lowest. Note that the prefix 'color.' is omitted (for brevity), and that any

View file

@ -676,7 +676,7 @@ void Context::clear ()
// this output?'.
void Context::updateXtermTitle ()
{
if (config.getBoolean ("xterm.title"))
if (config.getBoolean ("xterm.title") && isatty (fileno (stdout)))
{
std::string command;
a3.find_command (command);

View file

@ -336,6 +336,7 @@ void TF2::load_lines ()
_file.waitForLock ();
_file.read (_lines);
_file.close ();
_loaded_lines = true;
}
}