===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/tmux/cmd-show-options.c	2019/05/12 18:18:30	1.51
--- src/usr.bin/tmux/cmd-show-options.c	2019/05/22 18:58:31	1.52
***************
*** 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>
--- 1,4 ----
! /* $OpenBSD: cmd-show-options.c,v 1.52 2019/05/22 18:58:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 91,97 ****
  
  	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);
--- 91,104 ----
  
  	window = (self->entry == &cmd_show_window_options_entry);
  	if (args->argc == 0) {
! 		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
! 		if (scope == OPTIONS_TABLE_NONE) {
! 			if (args_has(args, 'q'))
! 				return (CMD_RETURN_NORMAL);
! 			cmdq_error(item, "%s", cause);
! 			free(cause);
! 			return (CMD_RETURN_ERROR);
! 		}
  		return (cmd_show_options_all(self, item, oo));
  	}
  	argument = format_single(item, args->argv[0], c, s, wl, NULL);