File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: a0c31ece9dba3665e0a44650ea492ae6f3e5604a
4
+ refs/heads/snap-stage3: ee7307e6cb9e942fc1ef27109bfbc6fbf730ee3c
5
5
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
Original file line number Diff line number Diff line change @@ -120,13 +120,15 @@ impl Terminal {
120
120
pub fn reset( & self ) {
121
121
let mut vars = Variables :: new ( ) ;
122
122
let s = do self . ti . strings . find_equiv ( & ( "op" ) )
123
- . map_consume_default ( Err ( ~"can' t find op ") ) |& op| {
123
+ . map_consume_default ( Err ( ~"can' t find terminfo capability `op` ") ) |& op| {
124
124
expand ( op, [ ] , & mut vars)
125
125
} ;
126
126
if s. is_ok ( ) {
127
127
self . out . write ( s. unwrap ( ) ) ;
128
- } else {
128
+ } else if self . num_colors > 0 {
129
129
warn ! ( "%s" , s. unwrap_err( ) ) ;
130
+ } else {
131
+ debug ! ( "%s" , s. unwrap_err( ) ) ;
130
132
}
131
133
}
132
134
You can’t perform that action at this time.
0 commit comments