===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -c -r1.250 -r1.251
*** src/usr.bin/tmux/format.c	2020/05/16 14:53:23	1.250
--- src/usr.bin/tmux/format.c	2020/05/16 14:55:38	1.251
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.250 2020/05/16 14:53:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.251 2020/05/16 14:55:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 2550,2556 ****
  	else
  		log_debug("%s: s=none", __func__);
  	if (wl != NULL)
! 		log_debug("%s: wl=%u w=@%u", __func__, wl->idx, wl->window->id);
  	else
  		log_debug("%s: wl=none", __func__);
  	if (wp != NULL)
--- 2550,2556 ----
  	else
  		log_debug("%s: s=none", __func__);
  	if (wl != NULL)
! 		log_debug("%s: wl=%u", __func__, wl->idx);
  	else
  		log_debug("%s: wl=none", __func__);
  	if (wp != NULL)
***************
*** 2724,2734 ****
  	u_int		 ox, oy, sx, sy;
  
  	if (ft->w == NULL)
! 		ft->w = wl->window;
  	ft->wl = wl;
  
- 	format_defaults_window(ft, w);
- 
  	if (c != NULL) {
  		flag = tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
  		format_add(ft, "window_bigger", "%d", flag);
--- 2724,2732 ----
  	u_int		 ox, oy, sx, sy;
  
  	if (ft->w == NULL)
! 		format_defaults_window(ft, w);
  	ft->wl = wl;
  
  	if (c != NULL) {
  		flag = tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
  		format_add(ft, "window_bigger", "%d", flag);
***************
*** 2788,2794 ****
  	struct window_mode_entry	*wme;
  
  	if (ft->w == NULL)
! 		ft->w = w;
  	ft->wp = wp;
  
  	format_add(ft, "history_size", "%u", gd->hsize);
--- 2786,2792 ----
  	struct window_mode_entry	*wme;
  
  	if (ft->w == NULL)
! 		format_defaults_window(ft, w);
  	ft->wp = wp;
  
  	format_add(ft, "history_size", "%u", gd->hsize);