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

auto merge of #7436 : kballard/rust/term-dumb, r=cmr

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:
bors 2013-06-28 07:40:57 -07:00
commit 4e4e2f70c9
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());
}
}