===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** src/usr.bin/tmux/cmd-show-options.c	2019/05/12 18:16:33	1.50
--- src/usr.bin/tmux/cmd-show-options.c	2019/05/12 18:18:30	1.51
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-options.c,v 1.50 2019/05/12 18:16:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-show-options.c,v 1.51 2019/05/12 18:18:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 90,97 ****
  	struct options_entry		*o;
  
  	window = (self->entry == &cmd_show_window_options_entry);
! 	if (args->argc == 0)
  		return (cmd_show_options_all(self, item, oo));
  	argument = format_single(item, args->argv[0], c, s, wl, NULL);
  
  	name = options_match(argument, &idx, &ambiguous);
--- 90,99 ----
  	struct options_entry		*o;
  
  	window = (self->entry == &cmd_show_window_options_entry);
! 	if (args->argc == 0) {
! 		options_scope_from_flags(args, window, fs, &oo, &cause);
  		return (cmd_show_options_all(self, item, oo));
+ 	}
  	argument = format_single(item, args->argv[0], c, s, wl, NULL);
  
  	name = options_match(argument, &idx, &ambiguous);