===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -c -r1.146 -r1.147
*** src/usr.bin/tmux/status.c	2015/12/11 16:37:21	1.146
--- src/usr.bin/tmux/status.c	2016/01/01 08:04:20	1.147
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.146 2015/12/11 16:37:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.147 2016/01/01 08:04:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 547,553 ****
  	struct message_entry	*msg, *msg1;
  	va_list			 ap;
  	int			 delay;
! 	u_int			 first, limit;
  
  	limit = options_get_number(global_options, "message-limit");
  
--- 547,553 ----
  	struct message_entry	*msg, *msg1;
  	va_list			 ap;
  	int			 delay;
! 	u_int			 limit;
  
  	limit = options_get_number(global_options, "message-limit");
  
***************
*** 564,573 ****
  	msg->msg = xstrdup(c->message_string);
  	TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
  
- 	first = c->message_next - limit;
  	TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
! 		if (msg->msg_num >= first)
! 			continue;
  		free(msg->msg);
  		TAILQ_REMOVE(&c->message_log, msg, entry);
  		free(msg);
--- 564,572 ----
  	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);