===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -c -r1.103 -r1.104
*** src/usr.bin/tmux/server-fn.c	2017/01/13 11:56:43	1.103
--- src/usr.bin/tmux/server-fn.c	2017/02/09 15:04:53	1.104
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.103 2017/01/13 11:56:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.104 2017/02/09 15:04:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 78,84 ****
  {
  	struct session_group	*sg;
  
! 	if ((sg = session_group_find(s)) == NULL)
  		server_redraw_session(s);
  	else {
  		TAILQ_FOREACH(s, &sg->sessions, gentry)
--- 78,84 ----
  {
  	struct session_group	*sg;
  
! 	if ((sg = session_group_contains(s)) == NULL)
  		server_redraw_session(s);
  	else {
  		TAILQ_FOREACH(s, &sg->sessions, gentry)
***************
*** 102,108 ****
  {
  	struct session_group	*sg;
  
! 	if ((sg = session_group_find(s)) == NULL)
  		server_status_session(s);
  	else {
  		TAILQ_FOREACH(s, &sg->sessions, gentry)
--- 102,108 ----
  {
  	struct session_group	*sg;
  
! 	if ((sg = session_group_contains(s)) == NULL)
  		server_status_session(s);
  	else {
  		TAILQ_FOREACH(s, &sg->sessions, gentry)
***************
*** 220,226 ****
  		}
  
  		if (options_get_number(s->options, "renumber-windows")) {
! 			if ((sg = session_group_find(s)) != NULL) {
  				TAILQ_FOREACH(target_s, &sg->sessions, gentry)
  					session_renumber_windows(target_s);
  			} else
--- 220,226 ----
  		}
  
  		if (options_get_number(s->options, "renumber-windows")) {
! 			if ((sg = session_group_contains(s)) != NULL) {
  				TAILQ_FOREACH(target_s, &sg->sessions, gentry)
  					session_renumber_windows(target_s);
  			} else
***************
*** 238,245 ****
  	struct winlink		*dstwl;
  	struct session_group	*srcsg, *dstsg;
  
! 	srcsg = session_group_find(src);
! 	dstsg = session_group_find(dst);
  	if (src != dst && srcsg != NULL && dstsg != NULL && srcsg == dstsg) {
  		xasprintf(cause, "sessions are grouped");
  		return (-1);
--- 238,245 ----
  	struct winlink		*dstwl;
  	struct session_group	*srcsg, *dstsg;
  
! 	srcsg = session_group_contains(src);
! 	dstsg = session_group_contains(dst);
  	if (src != dst && srcsg != NULL && dstsg != NULL && srcsg == dstsg) {
  		xasprintf(cause, "sessions are grouped");
  		return (-1);
***************
*** 348,354 ****
  	struct session_group	*sg;
  	struct session		*s1;
  
! 	if ((sg = session_group_find(s)) == NULL)
  		server_destroy_session(s);
  	else {
  		TAILQ_FOREACH_SAFE(s, &sg->sessions, gentry, s1) {
--- 348,354 ----
  	struct session_group	*sg;
  	struct session		*s1;
  
! 	if ((sg = session_group_contains(s)) == NULL)
  		server_destroy_session(s);
  	else {
  		TAILQ_FOREACH_SAFE(s, &sg->sessions, gentry, s1) {