Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

2025-09-03 22:43:58 +00:00 · 2013-03-11 21:31:46 +00:00
parent 064022548b 7c00950967
commit 543420ccd2
25 changed files with 459 additions and 132 deletions
--- a/client.c
+++ b/client.c
@ -270,7 +270,7 @@ client_main(int argc, char **argv, int flags)
 	if (msg == MSG_COMMAND) {
 		/* Fill in command line arguments. */
 		cmddata.pid = environ_pid;
-		cmddata.idx = environ_idx;
+		cmddata.session_id = environ_session_id;

 		/* Prepare command for server. */
 		cmddata.argc = argc;