===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -c -r1.188 -r1.189
*** src/usr.bin/tmux/tmux.c	2019/04/26 11:38:51	1.188
--- src/usr.bin/tmux/tmux.c	2019/06/20 11:59:59	1.189
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.188 2019/04/26 11:38:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.189 2019/06/20 11:59:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 321,331 ****
  	global_s_options = options_create(NULL);
  	global_w_options = options_create(NULL);
  	for (oe = options_table; oe->name != NULL; oe++) {
! 		if (oe->scope == OPTIONS_TABLE_SERVER)
  			options_default(global_options, oe);
! 		if (oe->scope == OPTIONS_TABLE_SESSION)
  			options_default(global_s_options, oe);
! 		if (oe->scope == OPTIONS_TABLE_WINDOW)
  			options_default(global_w_options, oe);
  	}
  
--- 321,331 ----
  	global_s_options = options_create(NULL);
  	global_w_options = options_create(NULL);
  	for (oe = options_table; oe->name != NULL; oe++) {
! 		if (oe->scope & OPTIONS_TABLE_SERVER)
  			options_default(global_options, oe);
! 		if (oe->scope & OPTIONS_TABLE_SESSION)
  			options_default(global_s_options, oe);
! 		if (oe->scope & OPTIONS_TABLE_WINDOW)
  			options_default(global_w_options, oe);
  	}