OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Smarter warning in extra::term::Terminal.reset()

Browse Source 
Don't spew a warn!() in reset() if num_colors is 0, because
non-color-supporting terminals are legit. Use debug!() there instead.
Continue spewing warn!() if we believe the terminal to support colors.

Use a better warning when the `op` capability can't be found.
This commit is contained in:
Kevin Ballard 2013-06-28 20:29:04 -07:00 committed by Daniel Micay
parent a0c31ece9d
commit ee7307e6cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libextra/term.rs
View File

@ -120,13 +120,15 @@ impl Terminal {
pub fn reset(&self) { pub fn reset(&self) {
let mut vars = Variables::new(); let mut vars = Variables::new();
let s = do self.ti.strings.find_equiv(&("op")) let s = do self.ti.strings.find_equiv(&("op"))
.map_consume_default(Err(~"can't find op")) |&op| { .map_consume_default(Err(~"can't find terminfo capability `op`")) |&op| {
expand(op, [], &mut vars) expand(op, [], &mut vars)
}; };
if s.is_ok() { if s.is_ok() {
self.out.write(s.unwrap()); self.out.write(s.unwrap());
} else { } else if self.num_colors > 0 {
warn!("%s", s.unwrap_err()); warn!("%s", s.unwrap_err());
} else {
debug!("%s", s.unwrap_err());
} }
} }