diff --git a/ChangeLog b/ChangeLog index bade9ddd6..57964e6bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 ------------------------------ diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in index 74484b041..e84cd28ff 100644 --- a/doc/man/task-color.5.in +++ b/doc/man/task-color.5.in @@ -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. diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in index 6ff85551a..de1c0b64c 100644 --- a/doc/man/taskrc.5.in +++ b/doc/man/taskrc.5.in @@ -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 diff --git a/src/Context.cpp b/src/Context.cpp index 014a26ba6..60c72122e 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -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); diff --git a/src/TDB2.cpp b/src/TDB2.cpp index b95e50ed3..a370857d5 100644 --- a/src/TDB2.cpp +++ b/src/TDB2.cpp @@ -336,6 +336,7 @@ void TF2::load_lines () _file.waitForLock (); _file.read (_lines); + _file.close (); _loaded_lines = true; } }