user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Teach extra::term::Terminal.reset() to handle missing op

Browse source 
Unlike fg() and bg(), we haven't already checked for the presence of
"op" in the terminfo when we call reset(), so we need to handle the case
where it's missing.

Also update the warn!() lines to avoid double-quoting the output.

Fixes #7431.
This commit is contained in:
Kevin Ballard 2013-06-27 13:37:55 -07:00
parent 9b6dfb8578
commit d9fed2b06f
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libextra/term.rs
View file

@ -97,7 +97,7 @@ impl Terminal {
if s.is_ok() {
self.out.write(s.unwrap());
} else {
warn!(s.unwrap_err());
warn!("%s", s.unwrap_err());
}
}
}
@ -113,17 +113,20 @@ impl Terminal {
if s.is_ok() {
self.out.write(s.unwrap());
} else {
warn!(s.unwrap_err());
warn!("%s", s.unwrap_err());
}
}
}
pub fn reset(&self) {
let mut vars = Variables::new();
let s = expand(*self.ti.strings.find_equiv(&("op")).unwrap(), [], &mut vars);
let s = do self.ti.strings.find_equiv(&("op"))
.map_consume_default(Err(~"can't find op")) |&op| {
expand(op, [], &mut vars)
};
if s.is_ok() {
self.out.write(s.unwrap());
} else {
warn!(s.unwrap_err());
warn!("%s", s.unwrap_err());
}
}