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

This commit is contained in:
Johannes Schlatow
2013-03-07 02:47:04 +01:00
4 changed files with 5 additions and 3 deletions

View File

@@ -113,6 +113,8 @@ Bugs
+ Added missing localized confirmation strings (thanks to Rainer Müller). + Added missing localized confirmation strings (thanks to Rainer Müller).
+ Fixed bug that added an extra newline after setting the terminal title + Fixed bug that added an extra newline after setting the terminal title
(thanks to Rainer Müller). (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 ------------------------------ ------ old releases ------------------------------

View File

@@ -243,7 +243,7 @@ be a visual mess. Beware!
The precedence for the color rules is determined by the configuration The precedence for the color rules is determined by the configuration
variable 'rule.precedence.color', which by default contains: 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 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. 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 .RE
.TP .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 .RS
This setting specifies the precedence of the color rules, from highest to 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 lowest. Note that the prefix 'color.' is omitted (for brevity), and that any

View File

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