===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/usr.bin/tmux/server.c	2012/07/10 11:53:01	1.105
--- src/usr.bin/tmux/server.c	2012/11/19 10:38:06	1.106
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.105 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.106 2012/11/19 10:38:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 106,116 ****
  int
  server_start(int lockfd, char *lockfile)
  {
! 	struct window_pane	*wp;
! 	int	 		 pair[2];
! 	char			*cause;
! 	struct timeval		 tv;
! 	u_int			 i;
  
  	/* The first client is special and gets a socketpair; create it. */
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
--- 106,113 ----
  int
  server_start(int lockfd, char *lockfile)
  {
! 	int	 	pair[2];
! 	struct timeval	tv;
  
  	/* The first client is special and gets a socketpair; create it. */
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
***************
*** 178,194 ****
  	 * If there is a session already, put the current window and pane into
  	 * more mode.
  	 */
! 	if (!RB_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes)) {
! 		wp = RB_MIN(sessions, &sessions)->curw->window->active;
! 		window_pane_set_mode(wp, &window_copy_mode);
! 		window_copy_init_for_output(wp);
! 		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
! 			cause = ARRAY_ITEM(&cfg_causes, i);
! 			window_copy_add(wp, "%s", cause);
! 			free(cause);
! 		}
! 		ARRAY_FREE(&cfg_causes);
! 	}
  	cfg_finished = 1;
  
  	server_add_accept(0);
--- 175,183 ----
  	 * If there is a session already, put the current window and pane into
  	 * more mode.
  	 */
! 	if (!RB_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes))
! 		show_cfg_causes(RB_MIN(sessions, &sessions));
! 
  	cfg_finished = 1;
  
  	server_add_accept(0);