===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/usr.bin/tmux/status.c	2015/02/01 23:43:23	1.120
--- src/usr.bin/tmux/status.c	2015/02/05 10:29:43	1.121
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.120 2015/02/01 23:43:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.121 2015/02/05 10:29:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 474,487 ****
  	*optr = '\0';
  
  	ft = format_create();
! 	if (c != NULL)
! 		format_client(ft, c);
! 	if (s != NULL)
! 		format_session(ft, s);
! 	if (s != NULL && wl != NULL)
! 		format_winlink(ft, s, wl);
! 	if (wp != NULL)
! 		format_window_pane(ft, wp);
  	expanded = format_expand(ft, out);
  	format_free(ft);
  	return (expanded);
--- 474,480 ----
  	*optr = '\0';
  
  	ft = format_create();
! 	format_defaults(ft, c, s, wl, wp);
  	expanded = format_expand(ft, out);
  	format_free(ft);
  	return (expanded);