Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-15 02:01:14 +00:00
7 changed files with 119 additions and 103 deletions

View File

@@ -567,7 +567,7 @@ 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)
if (wp == marked_pane.wp)
server_clear_marked();
if (wp == w->active) {
@@ -690,7 +690,7 @@ 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)
if (server_check_marked() && wl == marked_pane.wl)
flags[pos++] = 'M';
if (wl->window->flags & WINDOW_ZOOMED)
flags[pos++] = 'Z';