Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-20 12:01:14 +01:00
10 changed files with 119 additions and 64 deletions

View File

@ -709,12 +709,12 @@ window_destroy_panes(struct window *w)
}
}
/* Retuns the printable flags on a window, empty string if no flags set. */
char *
window_printable_flags(struct session *s, struct winlink *wl)
const char *
window_printable_flags(struct winlink *wl)
{
char flags[32];
int pos;
struct session *s = wl->session;
static char flags[32];
int pos;
pos = 0;
if (wl->flags & WINLINK_ACTIVITY)
@ -732,7 +732,7 @@ window_printable_flags(struct session *s, struct winlink *wl)
if (wl->window->flags & WINDOW_ZOOMED)
flags[pos++] = 'Z';
flags[pos] = '\0';
return (xstrdup(flags));
return (flags);
}
struct window_pane *