===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** src/usr.bin/tmux/format.c	2017/11/02 18:43:51	1.149
--- src/usr.bin/tmux/format.c	2017/11/02 18:52:05	1.150
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.149 2017/11/02 18:43:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.150 2017/11/02 18:52:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 577,585 ****
  	evbuffer_free(buffer);
  }
  
! /* Callback for session_group_others. */
  static void
! format_cb_session_group_others(struct format_tree *ft, struct format_entry *fe)
  {
  	struct session		*s = ft->s;
  	struct session_group	*sg;
--- 577,585 ----
  	evbuffer_free(buffer);
  }
  
! /* Callback for session_group_list. */
  static void
! format_cb_session_group_list(struct format_tree *ft, struct format_entry *fe)
  {
  	struct session		*s = ft->s;
  	struct session_group	*sg;
***************
*** 595,603 ****
  
  	buffer = evbuffer_new();
  	TAILQ_FOREACH(loop, &sg->sessions, gentry) {
- 		if (loop == s)
- 			continue;
- 
  		if (EVBUFFER_LENGTH(buffer) > 0)
  			evbuffer_add(buffer, ",", 1);
  		evbuffer_add_printf(buffer, "%s", loop->name);
--- 595,600 ----
***************
*** 1290,1297 ****
  		format_add(ft, "session_group", "%s", sg->name);
  		format_add(ft, "session_group_size", "%u",
  		    session_group_count (sg));
! 		format_add_cb(ft, "session_group_others",
! 		    format_cb_session_group_others);
  	}
  
  	format_add_tv(ft, "session_created", &s->creation_time);
--- 1287,1294 ----
  		format_add(ft, "session_group", "%s", sg->name);
  		format_add(ft, "session_group_size", "%u",
  		    session_group_count (sg));
! 		format_add_cb(ft, "session_group_list",
! 		    format_cb_session_group_list);
  	}
  
  	format_add_tv(ft, "session_created", &s->creation_time);