===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -c -r1.117 -r1.118
*** src/usr.bin/tmux/cmd-set-option.c	2017/06/23 15:36:52	1.117
--- src/usr.bin/tmux/cmd-set-option.c	2017/09/07 13:18:44	1.118
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.117 2017/06/23 15:36:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 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>
***************
*** 190,196 ****
  	/* Change the option. */
  	if (args_has(args, 'u')) {
  		if (o == NULL)
! 			goto fail;
  		if (idx == -1) {
  			if (oo == global_options ||
  			    oo == global_s_options ||
--- 190,196 ----
  	/* Change the option. */
  	if (args_has(args, 'u')) {
  		if (o == NULL)
! 			goto out;
  		if (idx == -1) {
  			if (oo == global_options ||
  			    oo == global_s_options ||