===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -c -r1.153 -r1.154
*** src/usr.bin/tmux/format.c	2018/03/08 08:09:10	1.153
--- src/usr.bin/tmux/format.c	2018/04/18 14:35:37	1.154
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.153 2018/03/08 08:09:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.154 2018/04/18 14:35:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1254,1259 ****
--- 1254,1262 ----
  format_defaults(struct format_tree *ft, struct client *c, struct session *s,
      struct winlink *wl, struct window_pane *wp)
  {
+ 	if (c != NULL && s != NULL && c->session != s)
+ 		log_debug("%s: session does not match", __func__);
+ 
  	format_add(ft, "session_format", "%d", s != NULL);
  	format_add(ft, "window_format", "%d", wl != NULL);
  	format_add(ft, "pane_format", "%d", wp != NULL);