summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2016-12-07 23:03:04 +0000
committernicm <nicm@openbsd.org>2016-12-07 23:03:04 +0000
commit94837f72d2790bebfbf63a12ae0fee25c8f2471f (patch)
tree5c41b697f76aa718819b1e00a2d9cae24285c443
parentWhen reporting "whitespace at end of input line" on lines ending with (diff)
downloadwireguard-openbsd-94837f72d2790bebfbf63a12ae0fee25c8f2471f.tar.xz
wireguard-openbsd-94837f72d2790bebfbf63a12ae0fee25c8f2471f.zip
Do not clear the prompt when a message is shown, just leave it around and
return to it when the message is finished.
-rw-r--r--usr.bin/tmux/status.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 46412e1863a..28c1cbf0757 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.155 2016/10/12 14:50:14 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.156 2016/12/07 23:03:04 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -554,7 +554,6 @@ status_message_set(struct client *c, const char *fmt, ...)
limit = options_get_number(global_options, "message-limit");
- status_prompt_clear(c);
status_message_clear(c);
va_start(ap, fmt);
@@ -600,7 +599,8 @@ status_message_clear(struct client *c)
free(c->message_string);
c->message_string = NULL;
- c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
+ if (c->prompt_string == NULL)
+ c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */
screen_reinit(&c->status);