===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/tmux/cmd-show-options.c	2020/04/13 07:25:33	1.59
--- src/usr.bin/tmux/cmd-show-options.c	2020/04/13 08:26:27	1.60
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-options.c,v 1.59 2020/04/13 07:25:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-show-options.c,v 1.60 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 77,83 ****
  static enum cmd_retval
  cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args			*args = self->args;
  	struct cmd_find_state		*fs = &item->target;
  	struct client			*c = cmd_find_client(item, NULL, 1);
  	struct session			*s = item->target.s;
--- 77,83 ----
  static enum cmd_retval
  cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args			*args = cmd_get_args(self);
  	struct cmd_find_state		*fs = &item->target;
  	struct client			*c = cmd_find_client(item, NULL, 1);
  	struct session			*s = item->target.s;
***************
*** 87,93 ****
  	int				 window, idx, ambiguous, parent, scope;
  	struct options_entry		*o;
  
! 	window = (self->entry == &cmd_show_window_options_entry);
  
  	if (args->argc == 0) {
  		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
--- 87,93 ----
  	int				 window, idx, ambiguous, parent, scope;
  	struct options_entry		*o;
  
! 	window = (cmd_get_entry(self) == &cmd_show_window_options_entry);
  
  	if (args->argc == 0) {
  		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
***************
*** 143,148 ****
--- 143,149 ----
  cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
      struct options_entry *o, int idx, int parent)
  {
+ 	struct args			*args = cmd_get_args(self);
  	struct options_array_item	*a;
  	const char			*name = options_name(o);
  	char				*value, *tmp = NULL, *escaped;
***************
*** 154,160 ****
  		if (options_isarray(o)) {
  			a = options_array_first(o);
  			if (a == NULL) {
! 				if (!args_has(self->args, 'v'))
  					cmdq_print(item, "%s", name);
  				return;
  			}
--- 155,161 ----
  		if (options_isarray(o)) {
  			a = options_array_first(o);
  			if (a == NULL) {
! 				if (!args_has(args, 'v'))
  					cmdq_print(item, "%s", name);
  				return;
  			}
***************
*** 169,175 ****
  	}
  
  	value = options_tostring(o, idx, 0);
! 	if (args_has(self->args, 'v'))
  		cmdq_print(item, "%s", value);
  	else if (options_isstring(o)) {
  		escaped = args_escape(value);
--- 170,176 ----
  	}
  
  	value = options_tostring(o, idx, 0);
! 	if (args_has(args, 'v'))
  		cmdq_print(item, "%s", value);
  	else if (options_isstring(o)) {
  		escaped = args_escape(value);
***************
*** 193,198 ****
--- 194,200 ----
  cmd_show_options_all(struct cmd *self, struct cmdq_item *item, int scope,
      struct options *oo)
  {
+ 	struct args				*args = cmd_get_args(self);
  	const struct options_table_entry	*oe;
  	struct options_entry			*o;
  	struct options_array_item		*a;
***************
*** 210,225 ****
  		if (~oe->scope & scope)
  			continue;
  
! 		if ((self->entry != &cmd_show_hooks_entry &&
! 		    !args_has(self->args, 'H') &&
  		    (oe->flags & OPTIONS_TABLE_IS_HOOK)) ||
! 		    (self->entry == &cmd_show_hooks_entry &&
  		    (~oe->flags & OPTIONS_TABLE_IS_HOOK)))
  			continue;
  
  		o = options_get_only(oo, oe->name);
  		if (o == NULL) {
! 			if (!args_has(self->args, 'A'))
  				continue;
  			o = options_get(oo, oe->name);
  			if (o == NULL)
--- 212,227 ----
  		if (~oe->scope & scope)
  			continue;
  
! 		if ((cmd_get_entry(self) != &cmd_show_hooks_entry &&
! 		    !args_has(args, 'H') &&
  		    (oe->flags & OPTIONS_TABLE_IS_HOOK)) ||
! 		    (cmd_get_entry(self) == &cmd_show_hooks_entry &&
  		    (~oe->flags & OPTIONS_TABLE_IS_HOOK)))
  			continue;
  
  		o = options_get_only(oo, oe->name);
  		if (o == NULL) {
! 			if (!args_has(args, 'A'))
  				continue;
  			o = options_get(oo, oe->name);
  			if (o == NULL)
***************
*** 231,237 ****
  		if (!options_isarray(o))
  			cmd_show_options_print(self, item, o, -1, parent);
  		else if ((a = options_array_first(o)) == NULL) {
! 			if (!args_has(self->args, 'v')) {
  				name = options_name(o);
  				if (parent)
  					cmdq_print(item, "%s*", name);
--- 233,239 ----
  		if (!options_isarray(o))
  			cmd_show_options_print(self, item, o, -1, parent);
  		else if ((a = options_array_first(o)) == NULL) {
! 			if (!args_has(args, 'v')) {
  				name = options_name(o);
  				if (parent)
  					cmdq_print(item, "%s*", name);