===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-run-shell.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/tmux/cmd-run-shell.c	2015/12/11 12:27:36	1.32
--- src/usr.bin/tmux/cmd-run-shell.c	2015/12/13 14:32:38	1.33
***************
*** 1,4 ****
! /* $OpenBSD: cmd-run-shell.c,v 1.32 2015/12/11 12:27:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-run-shell.c,v 1.33 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 39,45 ****
  	"run-shell", "run",
  	"bt:", 1, 1,
  	"[-b] " CMD_TARGET_PANE_USAGE " shell-command",
! 	0,
  	cmd_run_shell_exec
  };
  
--- 39,45 ----
  	"run-shell", "run",
  	"bt:", 1, 1,
  	"[-b] " CMD_TARGET_PANE_USAGE " shell-command",
! 	CMD_PANE_T|CMD_CANFAIL,
  	cmd_run_shell_exec
  };
  
***************
*** 75,105 ****
  	struct args			*args = self->args;
  	struct cmd_run_shell_data	*cdata;
  	char				*shellcmd;
! 	struct client			*c;
! 	struct session			*s = NULL;
! 	struct winlink			*wl = NULL;
! 	struct window_pane		*wp = NULL;
  	struct format_tree		*ft;
  	const char			*cwd;
  
! 	if (args_has(args, 't')) {
! 		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
! 		cwd = wp->cwd;
! 	} else {
! 		c = cmd_find_client(cmdq, NULL, 1);
! 		if (c != NULL && c->session != NULL) {
! 			s = c->session;
! 			wl = s->curw;
! 			wp = wl->window->active;
! 		}
! 		if (cmdq->client != NULL && cmdq->client->session == NULL)
! 			cwd = cmdq->client->cwd;
! 		else if (s != NULL)
! 			cwd = s->cwd;
! 		else
! 			cwd = NULL;
! 	}
! 
  	ft = format_create(cmdq, 0);
  	format_defaults(ft, NULL, s, wl, wp);
  	shellcmd = format_expand(ft, args->argv[0]);
--- 75,92 ----
  	struct args			*args = self->args;
  	struct cmd_run_shell_data	*cdata;
  	char				*shellcmd;
! 	struct session			*s = cmdq->state.tflag.s;
! 	struct winlink			*wl = cmdq->state.tflag.wl;
! 	struct window_pane		*wp = cmdq->state.tflag.wp;
  	struct format_tree		*ft;
  	const char			*cwd;
  
! 	if (cmdq->client != NULL && cmdq->client->session == NULL)
! 		cwd = cmdq->client->cwd;
! 	else if (s != NULL)
! 		cwd = s->cwd;
! 	else
! 		cwd = NULL;
  	ft = format_create(cmdq, 0);
  	format_defaults(ft, NULL, s, wl, wp);
  	shellcmd = format_expand(ft, args->argv[0]);