Merge branch 'master' into scrollback

This commit is contained in:
Christian Duerr 2018-07-28 23:16:28 +00:00 committed by GitHub
commit 7c5585ff25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions

View File

@ -477,6 +477,10 @@ impl<N: Notify> Processor<N> {
window.hide();
}
if self.window_changes.hide {
window.hide();
}
self.window_changes.clear();
self.wait_for_event = !terminal.dirty;

View File

@ -1079,6 +1079,7 @@ impl Term {
.map(|span| {
span.to_locations()
});
let cursor = if window_focused || !config.unfocused_hollow_cursor() {
self.cursor_style.unwrap_or(self.default_cursor_style)
} else {