===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/tmux/cmd-find.c	2015/10/22 11:23:00	1.14
+++ src/usr.bin/tmux/cmd-find.c	2015/10/23 16:29:07	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find.c,v 1.14 2015/10/22 11:23:00 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.15 2015/10/23 16:29:07 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <paths.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
@@ -51,6 +52,7 @@
 	int			 idx;
 };
 
+struct session	*cmd_find_try_TMUX(struct client *, struct window *);
 int		 cmd_find_client_better(struct client *, struct client *);
 struct client	*cmd_find_best_client(struct client **, u_int);
 int		 cmd_find_session_better(struct session *, struct session *,
@@ -109,6 +111,33 @@
 	{ NULL, NULL }
 };
 
+/* Get session from TMUX if present. */
+struct session *
+cmd_find_try_TMUX(struct client *c, struct window *w)
+{
+	struct environ_entry	*envent;
+	char			 tmp[256];
+	long long		 pid;
+	u_int			 session;
+	struct session		*s;
+
+	envent = environ_find(&c->environ, "TMUX");
+	if (envent == NULL)
+		return (NULL);
+
+	if (sscanf(envent->value, "%255[^,],%lld,%d", tmp, &pid, &session) != 3)
+		return (NULL);
+	if (pid != getpid())
+		return (NULL);
+	log_debug("client %d TMUX is %s (session @%u)", c->ibuf.fd,
+	    envent->value, session);
+
+	s = session_find_by_id(session);
+	if (s == NULL || (w != NULL && !session_has(s, w)))
+		return (NULL);
+	return (s);
+}
+
 /* Is this client better? */
 int
 cmd_find_client_better(struct client *c, struct client *than)
@@ -192,6 +221,12 @@
 	u_int		  ssize;
 	struct session	 *s;
 
+	if (fs->cmdq->client != NULL) {
+		fs->s = cmd_find_try_TMUX(fs->cmdq->client, fs->w);
+		if (fs->s != NULL)
+			return (cmd_find_best_winlink_with_window(fs));
+	}
+
 	ssize = 0;
 	RB_FOREACH(s, sessions, &sessions) {
 		if (!session_has(s, fs->w))
@@ -277,7 +312,9 @@
 	return (0);
 
 unknown_pane:
-	fs->s = cmd_find_best_session(NULL, 0, fs->flags);
+	fs->s = cmd_find_try_TMUX(fs->cmdq->client, NULL);
+	if (fs->s == NULL)
+		fs->s = cmd_find_best_session(NULL, 0, fs->flags);
 	if (fs->s == NULL)
 		return (-1);
 	fs->wl = fs->s->curw;