===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- src/usr.bin/tmux/status.c	2017/02/03 21:01:02	1.161
+++ src/usr.bin/tmux/status.c	2017/02/09 12:09:33	1.162
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.161 2017/02/03 21:01:02 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.162 2017/02/09 12:09:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -562,33 +562,17 @@
 void
 status_message_set(struct client *c, const char *fmt, ...)
 {
-	struct timeval		 tv;
-	struct message_entry	*msg, *msg1;
-	va_list			 ap;
-	int			 delay;
-	u_int			 limit;
+	struct timeval	tv;
+	va_list		ap;
+	int		delay;
 
-	limit = options_get_number(global_options, "message-limit");
-
 	status_message_clear(c);
 
 	va_start(ap, fmt);
 	xvasprintf(&c->message_string, fmt, ap);
 	va_end(ap);
 
-	msg = xcalloc(1, sizeof *msg);
-	msg->msg_time = time(NULL);
-	msg->msg_num = c->message_next++;
-	msg->msg = xstrdup(c->message_string);
-	TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
-
-	TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
-		if (msg->msg_num + limit >= c->message_next)
-			break;
-		free(msg->msg);
-		TAILQ_REMOVE(&c->message_log, msg, entry);
-		free(msg);
-	}
+	server_client_add_message(c, "%s", c->message_string);
 
 	delay = options_get_number(c->session->options, "display-time");
 	if (delay > 0) {