From 6e764fb53e7665d723d0ac58ec32c5b608f9c713 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 15 Jan 2015 13:43:13 +0000
Subject: [PATCH] Remove an unnecessary variable and shorten a line.

---
 window-choose.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/window-choose.c b/window-choose.c
index 56016394..0d724746 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -330,14 +330,12 @@ window_choose_collapse(struct window_pane *wp, struct session *s)
 	struct window_choose_mode_data	*data = wp->modedata;
 	struct window_choose_mode_item	*item, *chosen;
 	struct window_choose_data	*wcd;
-	u_int				 i, pos;
+	u_int				 i;
 
 	ARRAY_DECL(, struct window_choose_mode_item) list_copy;
 	ARRAY_INIT(&list_copy);
 
-	pos = data->selected;
-
-	chosen = &ARRAY_ITEM(&data->list, pos);
+	chosen = &ARRAY_ITEM(&data->list, data->selected);
 	chosen->state &= ~TREE_EXPANDED;
 
 	/*
@@ -353,9 +351,8 @@ window_choose_collapse(struct window_pane *wp, struct session *s)
 			/* We only show the session when collapsed. */
 			if (wcd->type & TREE_SESSION) {
 				item->state &= ~TREE_EXPANDED;
+				ARRAY_ADD(&list_copy, *item);
 
-				ARRAY_ADD(&list_copy,
-						ARRAY_ITEM(&data->list, i));
 				/*
 				 * Update the selection to this session item so
 				 * we don't end up highlighting a non-existent