===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -c -r1.118 -r1.119
*** src/usr.bin/tmux/cmd-set-option.c	2017/09/07 13:18:44	1.118
--- src/usr.bin/tmux/cmd-set-option.c	2017/12/22 10:18:51	1.119
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.118 2017/09/07 13:18:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.119 2017/12/22 10:18:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 192,198 ****
  		if (o == NULL)
  			goto out;
  		if (idx == -1) {
! 			if (oo == global_options ||
  			    oo == global_s_options ||
  			    oo == global_w_options)
  				options_default(oo, options_table_entry(o));
--- 192,200 ----
  		if (o == NULL)
  			goto out;
  		if (idx == -1) {
! 			if (*name == '@')
! 				options_remove(o);
! 			else if (oo == global_options ||
  			    oo == global_s_options ||
  			    oo == global_w_options)
  				options_default(oo, options_table_entry(o));