Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-12-08 00:01:10 +00:00
commit d3ede11212

View File

@ -554,7 +554,6 @@ status_message_set(struct client *c, const char *fmt, ...)
limit = options_get_number(global_options, "message-limit"); limit = options_get_number(global_options, "message-limit");
status_prompt_clear(c);
status_message_clear(c); status_message_clear(c);
va_start(ap, fmt); va_start(ap, fmt);
@ -600,6 +599,7 @@ status_message_clear(struct client *c)
free(c->message_string); free(c->message_string);
c->message_string = NULL; c->message_string = NULL;
if (c->prompt_string == NULL)
c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE); c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */ c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */