===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/popup.c	2020/04/13 14:46:04	1.11
--- src/usr.bin/tmux/popup.c	2020/04/13 15:55:51	1.12
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.11 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.12 2020/04/13 15:55:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 223,228 ****
--- 223,229 ----
  	struct mouse_event	*m = &event->m;
  	struct cmd_find_state	*fs = &pd->fs;
  	struct cmdq_item	*new_item;
+ 	struct cmdq_state	*new_state;
  	struct cmd_parse_result	*pr;
  	struct format_tree	*ft;
  	const char		*cmd, *buf;
***************
*** 308,314 ****
  			event = cmdq_get_event(pd->item);
  		else
  			event = NULL;
! 		new_item = cmdq_get_command(pr->cmdlist, fs, event, 0);
  		cmd_list_free(pr->cmdlist);
  		cmdq_append(c, new_item);
  		break;
--- 309,317 ----
  			event = cmdq_get_event(pd->item);
  		else
  			event = NULL;
! 		new_state = cmdq_new_state(&pd->fs, event, 0);
! 		new_item = cmdq_get_command(pr->cmdlist, new_state);
! 		cmdq_free_state(new_state);
  		cmd_list_free(pr->cmdlist);
  		cmdq_append(c, new_item);
  		break;