===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/tmux/cmd-set-option.c	2020/04/13 10:59:58	1.131
--- src/usr.bin/tmux/cmd-set-option.c	2020/04/13 20:51:57	1.132
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.131 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.132 2020/04/13 20:51:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 84,90 ****
  	struct args			*args = cmd_get_args(self);
  	int				 append = args_has(args, 'a');
  	struct cmd_find_state		*target = cmdq_get_target(item);
! 	struct client			*c, *loop;
  	struct session			*s = target->s;
  	struct window			*w;
  	struct window_pane		*wp;
--- 84,91 ----
  	struct args			*args = cmd_get_args(self);
  	int				 append = args_has(args, 'a');
  	struct cmd_find_state		*target = cmdq_get_target(item);
! 	struct client			*tc = cmdq_get_target_client(item);
! 	struct client			*loop;
  	struct session			*s = target->s;
  	struct window			*w;
  	struct window_pane		*wp;
***************
*** 98,105 ****
  	window = (cmd_get_entry(self) == &cmd_set_window_option_entry);
  
  	/* Expand argument. */
! 	c = cmd_find_client(item, NULL, 1);
! 	argument = format_single_from_target(item, args->argv[0], c);
  
  	/* If set-hook -R, fire the hook straight away. */
  	if (cmd_get_entry(self) == &cmd_set_hook_entry && args_has(args, 'R')) {
--- 99,105 ----
  	window = (cmd_get_entry(self) == &cmd_set_window_option_entry);
  
  	/* Expand argument. */
! 	argument = format_single_from_target(item, args->argv[0]);
  
  	/* If set-hook -R, fire the hook straight away. */
  	if (cmd_get_entry(self) == &cmd_set_hook_entry && args_has(args, 'R')) {
***************
*** 122,128 ****
  	if (args->argc < 2)
  		value = NULL;
  	else if (args_has(args, 'F'))
! 		value = format_single_from_target(item, args->argv[1], c);
  	else
  		value = xstrdup(args->argv[1]);
  
--- 122,128 ----
  	if (args->argc < 2)
  		value = NULL;
  	else if (args_has(args, 'F'))
! 		value = format_single_from_target(item, args->argv[1]);
  	else
  		value = xstrdup(args->argv[1]);