Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-04 12:59:41 +01:00
11 changed files with 296 additions and 40 deletions

View File

@@ -542,6 +542,9 @@ window_add_pane(struct window *w, u_int hlimit)
void
window_lost_pane(struct window *w, struct window_pane *wp)
{
if (wp == marked_window_pane)
server_clear_marked();
if (wp == w->active) {
w->active = w->last;
w->last = NULL;
@@ -660,6 +663,8 @@ window_printable_flags(struct session *s, struct winlink *wl)
flags[pos++] = '*';
if (wl == TAILQ_FIRST(&s->lastw))
flags[pos++] = '-';
if (server_check_marked() && wl == marked_winlink)
flags[pos++] = 'M';
if (wl->window->flags & WINDOW_ZOOMED)
flags[pos++] = 'Z';
flags[pos] = '\0';