===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/tmux/popup.c	2020/04/07 13:33:00	1.7
--- src/usr.bin/tmux/popup.c	2020/04/13 10:59:59	1.8
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.7 2020/04/07 13:33:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.8 2020/04/13 10:59:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 64,70 ****
  	struct format_tree	*ft;
  	u_int			 i, y;
  
! 	ft = format_create(item->client, item, FORMAT_NONE, 0);
  	if (cmd_find_valid_state(&pd->fs))
  		format_defaults(ft, c, pd->fs.s, pd->fs.wl, pd->fs.wp);
  	else
--- 64,70 ----
  	struct format_tree	*ft;
  	u_int			 i, y;
  
! 	ft = format_create(c, item, FORMAT_NONE, 0);
  	if (cmd_find_valid_state(&pd->fs))
  		format_defaults(ft, c, pd->fs.s, pd->fs.wl, pd->fs.wp);
  	else
***************
*** 152,160 ****
  
  	if (item != NULL) {
  		if (pd->ictx != NULL &&
! 		    item->client != NULL &&
! 		    item->client->session == NULL)
! 			item->client->retval = pd->status;
  		cmdq_continue(item);
  	}
  	server_client_unref(pd->c);
--- 152,160 ----
  
  	if (item != NULL) {
  		if (pd->ictx != NULL &&
! 		    cmdq_get_client(item) != NULL &&
! 		    cmdq_get_client(item)->session == NULL)
! 			cmdq_get_client(item)->retval = pd->status;
  		cmdq_continue(item);
  	}
  	server_client_unref(pd->c);
***************
*** 305,311 ****
  		break;
  	case CMD_PARSE_SUCCESS:
  		if (pd->item != NULL)
! 			m = &pd->item->shared->mouse;
  		else
  			m = NULL;
  		new_item = cmdq_get_command(pr->cmdlist, fs, m, 0);
--- 305,311 ----
  		break;
  	case CMD_PARSE_SUCCESS:
  		if (pd->item != NULL)
! 			m = &cmdq_get_shared(pd->item)->mouse;
  		else
  			m = NULL;
  		new_item = cmdq_get_command(pr->cmdlist, fs, m, 0);
***************
*** 382,388 ****
  	struct format_tree	*ft;
  	u_int			 i, width = 0, tmpwidth;
  
! 	ft = format_create(item->client, item, FORMAT_NONE, 0);
  	if (fs != NULL && cmd_find_valid_state(fs))
  		format_defaults(ft, c, fs->s, fs->wl, fs->wp);
  	else
--- 382,388 ----
  	struct format_tree	*ft;
  	u_int			 i, width = 0, tmpwidth;
  
! 	ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
  	if (fs != NULL && cmd_find_valid_state(fs))
  		format_defaults(ft, c, fs->s, fs->wl, fs->wp);
  	else