Format for group list of "other sessions" is a bit weird, just list all

the sessions in the group.

3 files changed, 7 insertions, 12 deletions

diff --git a/format.c b/format.c
index e254eb22..1b967c93 100644
--- a/format.c
+++ b/format.c
@@ -577,9 +577,9 @@ format_cb_pane_tabs(struct format_tree *ft, struct format_entry *fe)
 	evbuffer_free(buffer);
 }
 
-/* Callback for session_group_others. */
+/* Callback for session_group_list. */
 static void
-format_cb_session_group_others(struct format_tree *ft, struct format_entry *fe)
+format_cb_session_group_list(struct format_tree *ft, struct format_entry *fe)
 {
 	struct session		*s = ft->s;
 	struct session_group	*sg;
@@ -595,9 +595,6 @@ format_cb_session_group_others(struct format_tree *ft, struct format_entry *fe)
 
 	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);
@@ -1290,8 +1287,8 @@ format_defaults_session(struct format_tree *ft, struct session *s)
 		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_cb(ft, "session_group_list",
+		    format_cb_session_group_list);
 	}
 
 	format_add_tv(ft, "session_created", &s->creation_time);
diff --git a/tmux.1 b/tmux.1
index b7b2a088..a67a7274 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3714,7 +3714,7 @@ The following variables are available, where appropriate:
 .It Li "session_last_attached" Ta "" Ta "Time session last attached"
 .It Li "session_group" Ta "" Ta "Name of session group"
 .It Li "session_group_size" Ta "" Ta "Size of session group"
-.It Li "session_group_others" Ta "" Ta "List of other sessions in group"
+.It Li "session_group_list" Ta "" Ta "List of sessions in group"
 .It Li "session_grouped" Ta "" Ta "1 if session in a group"
 .It Li "session_height" Ta "" Ta "Height of session"
 .It Li "session_id" Ta "" Ta "Unique session ID"
diff --git a/window-tree.c b/window-tree.c
index 563c64e0..c83db557 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -44,10 +44,8 @@ static void		 window_tree_key(struct window_pane *,
 		"," \
 			"#{session_windows} windows" \
 			"#{?session_grouped, " \
-				"(group #{session_group}" \
-				"#{?session_group_others," \
-					" with #{session_group_others}," \
-				"})," \
+				"(group #{session_group}: " \
+				"#{session_group_list})," \
 			"}" \
 			"#{?session_attached, (attached),}" \
 		"}" \