===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/tmux/cmd-set-option.c	2012/02/25 12:57:42	1.53
--- src/usr.bin/tmux/cmd-set-option.c	2012/03/17 21:33:33	1.54
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.53 2012/02/25 12:57:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.54 2012/03/17 21:33:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 60,67 ****
  
  const struct cmd_entry cmd_set_option_entry = {
  	"set-option", "set",
! 	"agst:uw", 1, 2,
! 	"[-agsuw] [-t target-session|target-window] option [value]",
  	0,
  	NULL,
  	NULL,
--- 60,67 ----
  
  const struct cmd_entry cmd_set_option_entry = {
  	"set-option", "set",
! 	"agqst:uw", 1, 2,
! 	"[-agsquw] [-t target-session|target-window] option [value]",
  	0,
  	NULL,
  	NULL,
***************
*** 70,77 ****
  
  const struct cmd_entry cmd_set_window_option_entry = {
  	"set-window-option", "setw",
! 	"agt:u", 1, 2,
! 	"[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
  	0,
  	NULL,
  	NULL,
--- 70,77 ----
  
  const struct cmd_entry cmd_set_window_option_entry = {
  	"set-window-option", "setw",
! 	"agqt:u", 1, 2,
! 	"[-agqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
  	0,
  	NULL,
  	NULL,
***************
*** 175,181 ****
  	}
  
  	options_remove(oo, oe->name);
! 	ctx->info(ctx, "unset option: %s", oe->name);
  	return (0);
  }
  
--- 175,182 ----
  	}
  
  	options_remove(oo, oe->name);
! 	if (!args_has(args, 'q'))
! 		ctx->info(ctx, "unset option: %s", oe->name);
  	return (0);
  }
  
***************
*** 184,189 ****
--- 185,191 ----
  cmd_set_option_set(struct cmd *self, struct cmd_ctx *ctx,
      const struct options_table_entry *oe, struct options *oo, const char *value)
  {
+ 	struct args		*args = self->args;
  	struct options_entry	*o;
  	const char		*s;
  
***************
*** 220,226 ****
  		return (-1);
  
  	s = options_table_print_entry(oe, o);
! 	ctx->info(ctx, "set option: %s -> %s", oe->name, s);
  	return (0);
  }
  
--- 222,229 ----
  		return (-1);
  
  	s = options_table_print_entry(oe, o);
! 	if (!args_has(args, 'q'))
! 		ctx->info(ctx, "set option: %s -> %s", oe->name, s);
  	return (0);
  }
  
***************
*** 229,235 ****
  cmd_set_option_string(struct cmd *self, unused struct cmd_ctx *ctx,
      const struct options_table_entry *oe, struct options *oo, const char *value)
  {
! 	struct args	*args = self->args;
  	struct options_entry	*o;
  	char			*oldval, *newval;
  
--- 232,238 ----
  cmd_set_option_string(struct cmd *self, unused struct cmd_ctx *ctx,
      const struct options_table_entry *oe, struct options *oo, const char *value)
  {
! 	struct args		*args = self->args;
  	struct options_entry	*o;
  	char			*oldval, *newval;