From 8c50f625b0698e35ad183864e3baa4bb8679e0ae Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 21 Feb 2013 16:54:13 +0000
Subject: [PATCH] Add session_set_current helper function, extracted from a
 diff from Aaron Jensen.

---
 session.c | 38 +++++++++++++++-----------------------
 tmux.h    |  1 +
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/session.c b/session.c
index 1f4fb30c..72e8fb05 100644
--- a/session.c
+++ b/session.c
@@ -345,13 +345,7 @@ session_next(struct session *s, int alert)
 		if (alert && ((wl = session_next_alert(wl)) == NULL))
 			return (-1);
 	}
-	if (wl == s->curw)
-		return (1);
-	winlink_stack_remove(&s->lastw, wl);
-	winlink_stack_push(&s->lastw, s->curw);
-	s->curw = wl;
-	winlink_clear_flags(wl);
-	return (0);
+	return (session_set_current(s, wl));
 }
 
 struct winlink *
@@ -382,13 +376,7 @@ session_previous(struct session *s, int alert)
 		if (alert && (wl = session_previous_alert(wl)) == NULL)
 			return (-1);
 	}
-	if (wl == s->curw)
-		return (1);
-	winlink_stack_remove(&s->lastw, wl);
-	winlink_stack_push(&s->lastw, s->curw);
-	s->curw = wl;
-	winlink_clear_flags(wl);
-	return (0);
+	return (session_set_current(s, wl));
 }
 
 /* Move session to specific window. */
@@ -398,15 +386,7 @@ session_select(struct session *s, int idx)
 	struct winlink	*wl;
 
 	wl = winlink_find_by_index(&s->windows, idx);
-	if (wl == NULL)
-		return (-1);
-	if (wl == s->curw)
-		return (1);
-	winlink_stack_remove(&s->lastw, wl);
-	winlink_stack_push(&s->lastw, s->curw);
-	s->curw = wl;
-	winlink_clear_flags(wl);
-	return (0);
+	return (session_set_current(s, wl));
 }
 
 /* Move session to last used window. */
@@ -421,6 +401,18 @@ session_last(struct session *s)
 	if (wl == s->curw)
 		return (1);
 
+	return (session_set_current(s, wl));
+}
+
+/* Set current winlink to wl .*/
+int
+session_set_current(struct session *s, struct winlink *wl)
+{
+	if (wl == NULL)
+		return (-1);
+	if (wl == s->curw)
+		return (1);
+
 	winlink_stack_remove(&s->lastw, wl);
 	winlink_stack_push(&s->lastw, s->curw);
 	s->curw = wl;
diff --git a/tmux.h b/tmux.h
index 4fd62d30..18e692fe 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2276,6 +2276,7 @@ int		 session_next(struct session *, int);
 int		 session_previous(struct session *, int);
 int		 session_select(struct session *, int);
 int		 session_last(struct session *);
+int		 session_set_current(struct session *, struct winlink *);
 struct session_group *session_group_find(struct session *);
 u_int		 session_group_index(struct session_group *);
 void		 session_group_add(struct session *, struct session *);