===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-messages.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/cmd-show-messages.c	2014/01/22 14:43:42	1.8
--- src/usr.bin/tmux/cmd-show-messages.c	2014/02/14 13:59:01	1.9
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-messages.c,v 1.8 2014/01/22 14:43:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-show-messages.c,v 1.9 2014/02/14 13:59:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 49,60 ****
  	cmd_show_messages_exec
  };
  
! void	cmd_show_messages_server (struct cmd_q *);
! void	cmd_show_messages_terminals (struct cmd_q *);
! void	cmd_show_messages_jobs (struct cmd_q *);
  
  void
! cmd_show_messages_server (struct cmd_q *cmdq)
  {
  	char	*tim;
  
--- 49,60 ----
  	cmd_show_messages_exec
  };
  
! void	cmd_show_messages_server(struct cmd_q *);
! void	cmd_show_messages_terminals(struct cmd_q *);
! void	cmd_show_messages_jobs(struct cmd_q *);
  
  void
! cmd_show_messages_server(struct cmd_q *cmdq)
  {
  	char	*tim;
  
***************
*** 68,74 ****
  }
  
  void
! cmd_show_messages_terminals (struct cmd_q *cmdq)
  {
  	struct tty_term				*term;
  	const struct tty_term_code_entry	*ent;
--- 68,74 ----
  }
  
  void
! cmd_show_messages_terminals(struct cmd_q *cmdq)
  {
  	struct tty_term				*term;
  	const struct tty_term_code_entry	*ent;
***************
*** 111,117 ****
  }
  
  void
! cmd_show_messages_jobs (struct cmd_q *cmdq)
  {
  	struct job	*job;
  	u_int		 n;
--- 111,117 ----
  }
  
  void
! cmd_show_messages_jobs(struct cmd_q *cmdq)
  {
  	struct job	*job;
  	u_int		 n;
***************
*** 136,155 ****
  	int			 done;
  
  	done = 0;
! 	if (args_has (args, 'I') || self->entry == &cmd_server_info_entry) {
! 		cmd_show_messages_server (cmdq);
  		done = 1;
  	}
! 	if (args_has (args, 'T') || self->entry == &cmd_server_info_entry) {
  		if (done)
! 			cmdq_print (cmdq, "%s", "");
! 		cmd_show_messages_terminals (cmdq);
  		done = 1;
  	}
! 	if (args_has (args, 'J') || self->entry == &cmd_server_info_entry) {
  		if (done)
! 			cmdq_print (cmdq, "%s", "");
! 		cmd_show_messages_jobs (cmdq);
  		done = 1;
  	}
  	if (done)
--- 136,155 ----
  	int			 done;
  
  	done = 0;
! 	if (args_has(args, 'I') || self->entry == &cmd_server_info_entry) {
! 		cmd_show_messages_server(cmdq);
  		done = 1;
  	}
! 	if (args_has(args, 'T') || self->entry == &cmd_server_info_entry) {
  		if (done)
! 			cmdq_print(cmdq, "%s", "");
! 		cmd_show_messages_terminals(cmdq);
  		done = 1;
  	}
! 	if (args_has(args, 'J') || self->entry == &cmd_server_info_entry) {
  		if (done)
! 			cmdq_print(cmdq, "%s", "");
! 		cmd_show_messages_jobs(cmdq);
  		done = 1;
  	}
  	if (done)