===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** src/usr.bin/tmux/cmd-list-windows.c	2020/04/13 08:26:27	1.45
--- src/usr.bin/tmux/cmd-list-windows.c	2020/04/13 10:59:58	1.46
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.45 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.46 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 61,72 ****
  static enum cmd_retval
  cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args	*args = cmd_get_args(self);
  
  	if (args_has(args, 'a'))
  		cmd_list_windows_server(self, item);
  	else
! 		cmd_list_windows_session(self, item->target.s, item, 0);
  
  	return (CMD_RETURN_NORMAL);
  }
--- 61,73 ----
  static enum cmd_retval
  cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = cmd_get_args(self);
! 	struct cmd_find_state	*target = cmdq_get_target(item);
  
  	if (args_has(args, 'a'))
  		cmd_list_windows_server(self, item);
  	else
! 		cmd_list_windows_session(self, target->s, item, 0);
  
  	return (CMD_RETURN_NORMAL);
  }
***************
*** 107,113 ****
  
  	n = 0;
  	RB_FOREACH(wl, winlinks, &s->windows) {
! 		ft = format_create(item->client, item, FORMAT_NONE, 0);
  		format_add(ft, "line", "%u", n);
  		format_defaults(ft, NULL, s, wl, NULL);
  
--- 108,114 ----
  
  	n = 0;
  	RB_FOREACH(wl, winlinks, &s->windows) {
! 		ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
  		format_add(ft, "line", "%u", n);
  		format_defaults(ft, NULL, s, wl, NULL);