===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-set-window-option.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/Attic/cmd-set-window-option.c	2009/10/09 07:27:00	1.13
--- src/usr.bin/tmux/Attic/cmd-set-window-option.c	2009/11/13 19:53:29	1.14
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-window-option.c,v 1.13 2009/10/09 07:27:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-window-option.c,v 1.14 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  const struct cmd_entry cmd_set_window_option_entry = {
  	"set-window-option", "setw",
  	"[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
! 	CMD_ARG12, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'),
  	NULL,
  	cmd_target_parse,
  	cmd_set_window_option_exec,
--- 32,38 ----
  const struct cmd_entry cmd_set_window_option_entry = {
  	"set-window-option", "setw",
  	"[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
! 	CMD_ARG12, "agu",
  	NULL,
  	cmd_target_parse,
  	cmd_set_window_option_exec,
***************
*** 86,92 ****
  	const struct set_option_entry   *entry, *opt;
  	u_int				 i;
  
! 	if (data->chflags & CMD_CHFLAG('g'))
  		oo = &global_w_options;
  	else {
  		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
--- 86,92 ----
  	const struct set_option_entry   *entry, *opt;
  	u_int				 i;
  
! 	if (cmd_check_flag(data->chflags, 'g'))
  		oo = &global_w_options;
  	else {
  		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
***************
*** 118,125 ****
  		return (-1);
  	}
  
! 	if (data->chflags & CMD_CHFLAG('u')) {
! 		if (data->chflags & CMD_CHFLAG('g')) {
  			ctx->error(ctx,
  			    "can't unset global option: %s", entry->name);
  			return (-1);
--- 118,125 ----
  		return (-1);
  	}
  
! 	if (cmd_check_flag(data->chflags, 'u')) {
! 		if (cmd_check_flag(data->chflags, 'g')) {
  			ctx->error(ctx,
  			    "can't unset global option: %s", entry->name);
  			return (-1);
***************
*** 136,142 ****
  		switch (entry->type) {
  		case SET_OPTION_STRING:
  			set_option_string(ctx, oo, entry,
! 			    data->arg2, data->chflags & CMD_CHFLAG('a'));
  			break;
  		case SET_OPTION_NUMBER:
  			set_option_number(ctx, oo, entry, data->arg2);
--- 136,142 ----
  		switch (entry->type) {
  		case SET_OPTION_STRING:
  			set_option_string(ctx, oo, entry,
! 			    data->arg2, cmd_check_flag(data->chflags, 'a'));
  			break;
  		case SET_OPTION_NUMBER:
  			set_option_number(ctx, oo, entry, data->arg2);