===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -c -r1.114 -r1.115
*** src/usr.bin/tmux/cmd.c	2015/12/13 18:27:47	1.114
--- src/usr.bin/tmux/cmd.c	2015/12/13 18:31:47	1.115
***************
*** 1,4 ****
! /* $OpenBSD: cmd.c,v 1.114 2015/12/13 18:27:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd.c,v 1.115 2015/12/13 18:31:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 585,591 ****
  	struct cmd_state	*state = &cmdq->state;
  	struct args		*args = cmd->args;
  	char			*tmp;
! 	int			 error;
  
  	tmp = cmd_print(cmd);
  	log_debug("preparing state for: %s (client %p)", tmp, cmdq->client);
--- 585,591 ----
  	struct cmd_state	*state = &cmdq->state;
  	struct args		*args = cmd->args;
  	char			*tmp;
! 	int			 error, quiet;
  
  	tmp = cmd_print(cmd);
  	log_debug("preparing state for: %s (client %p)", tmp, cmdq->client);
***************
*** 594,599 ****
--- 594,604 ----
  	/* Start with an empty state. */
  	cmd_clear_state(state);
  
+ 	/* No error messages if can fail. */
+ 	quiet = 0;
+ 	if (cmd->entry->flags & CMD_CLIENT_CANFAIL)
+ 		quiet = 1;
+ 
  	/*
  	 * If the command wants a client and provides -c or -t, use it. If not,
  	 * try the base command instead via cmd_get_state_client. No client is
***************
*** 604,616 ****
  		state->c = cmd_find_client(cmdq, NULL, 1);
  		break;
  	case CMD_CLIENT_C:
! 		state->c = cmd_find_client(cmdq, args_get(args, 'c'), 0);
! 		if (state->c == NULL)
  			return (-1);
  		break;
  	case CMD_CLIENT_T:
! 		state->c = cmd_find_client(cmdq, args_get(args, 't'), 0);
! 		if (state->c == NULL)
  			return (-1);
  		break;
  	default:
--- 609,621 ----
  		state->c = cmd_find_client(cmdq, NULL, 1);
  		break;
  	case CMD_CLIENT_C:
! 		state->c = cmd_find_client(cmdq, args_get(args, 'c'), quiet);
! 		if (!quiet && state->c == NULL)
  			return (-1);
  		break;
  	case CMD_CLIENT_T:
! 		state->c = cmd_find_client(cmdq, args_get(args, 't'), quiet);
! 		if (!quiet && state->c == NULL)
  			return (-1);
  		break;
  	default: