===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- src/usr.bin/tmux/cmd.c	2013/10/10 12:28:56	1.88
+++ src/usr.bin/tmux/cmd.c	2013/10/10 12:29:35	1.89
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.88 2013/10/10 12:28:56 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.89 2013/10/10 12:29:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -314,7 +314,6 @@
 struct session *
 cmd_current_session(struct cmd_q *cmdq, int prefer_unattached)
 {
-	struct msg_command_data	*data = cmdq->msgdata;
 	struct client		*c = cmdq->client;
 	struct session		*s;
 	struct sessionslist	 ss;
@@ -352,13 +351,6 @@
 
 		s = cmd_choose_session_list(&ss);
 		ARRAY_FREE(&ss);
-		if (s != NULL)
-			return (s);
-	}
-
-	/* Use the session from the TMUX environment variable. */
-	if (data != NULL && data->pid == getpid() && data->session_id != -1) {
-		s = session_find_by_id(data->session_id);
 		if (s != NULL)
 			return (s);
 	}