===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-set-window-option.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tmux/Attic/cmd-set-window-option.c	2009/07/07 19:49:19	1.3
--- src/usr.bin/tmux/Attic/cmd-set-window-option.c	2009/07/13 23:11:35	1.4
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-window-option.c,v 1.3 2009/07/07 19:49:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-window-option.c,v 1.4 2009/07/13 23:11:35 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",
  	CMD_OPTION_WINDOW_USAGE,
! 	CMD_GFLAG|CMD_UFLAG,
  	NULL,
  	cmd_option_parse,
  	cmd_set_window_option_exec,
--- 32,38 ----
  const struct cmd_entry cmd_set_window_option_entry = {
  	"set-window-option", "setw",
  	CMD_OPTION_WINDOW_USAGE,
! 	0, CMD_CHFLAG('g')|CMD_CHFLAG('u'),
  	NULL,
  	cmd_option_parse,
  	cmd_set_window_option_exec,
***************
*** 81,87 ****
  	const struct set_option_entry   *entry;
  	u_int				 i;
  
! 	if (data->flags & CMD_GFLAG)
  		oo = &global_w_options;
  	else {
  		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
--- 81,87 ----
  	const struct set_option_entry   *entry;
  	u_int				 i;
  
! 	if (data->chflags & CMD_CHFLAG('g'))
  		oo = &global_w_options;
  	else {
  		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
***************
*** 114,121 ****
  		return (-1);
  	}
  
! 	if (data->flags & CMD_UFLAG) {
! 		if (data->flags & CMD_GFLAG) {
  			ctx->error(ctx,
  			    "can't unset global option: %s", entry->name);
  			return (-1);
--- 114,121 ----
  		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);