===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-confirm-before.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/cmd-confirm-before.c	2011/07/02 21:05:44	1.11
--- src/usr.bin/tmux/cmd-confirm-before.c	2011/07/08 06:37:57	1.12
***************
*** 1,4 ****
! /* $OpenBSD: cmd-confirm-before.c,v 1.11 2011/07/02 21:05:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-confirm-before.c,v 1.12 2011/07/08 06:37:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 33,40 ****
  
  const struct cmd_entry cmd_confirm_before_entry = {
  	"confirm-before", "confirm",
! 	"t:", 1, 1,
! 	CMD_TARGET_CLIENT_USAGE " command",
  	0,
  	cmd_confirm_before_key_binding,
  	NULL,
--- 33,40 ----
  
  const struct cmd_entry cmd_confirm_before_entry = {
  	"confirm-before", "confirm",
! 	"p:t:", 1, 1,
! 	"[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
  	0,
  	cmd_confirm_before_key_binding,
  	NULL,
***************
*** 52,60 ****
--- 52,62 ----
  	switch (key) {
  	case '&':
  		self->args = args_create(1, "kill-window");
+ 		args_set(self->args, 'p', "kill-window #W? (y/n)");
  		break;
  	case 'x':
  		self->args = args_create(1, "kill-pane");
+ 		args_set(self->args, 'p', "kill-pane #P? (y/n)");
  		break;
  	default:
  		self->args = args_create(0);
***************
*** 68,74 ****
  	struct args			*args = self->args;
  	struct cmd_confirm_before_data	*cdata;
  	struct client			*c;
! 	char				*buf, *cmd, *ptr;
  
  	if (ctx->curclient == NULL) {
  		ctx->error(ctx, "must be run interactively");
--- 70,77 ----
  	struct args			*args = self->args;
  	struct cmd_confirm_before_data	*cdata;
  	struct client			*c;
! 	char				*cmd, *copy, *new_prompt, *ptr;
! 	const char			*prompt;
  
  	if (ctx->curclient == NULL) {
  		ctx->error(ctx, "must be run interactively");
***************
*** 78,96 ****
  	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
  		return (-1);
  
! 	ptr = xstrdup(args->argv[0]);
! 	if ((cmd = strtok(ptr, " \t")) == NULL)
! 		cmd = ptr;
! 	xasprintf(&buf, "Confirm '%s'? (y/n) ", cmd);
! 	xfree(ptr);
  
  	cdata = xmalloc(sizeof *cdata);
  	cdata->cmd = xstrdup(args->argv[0]);
  	cdata->c = c;
! 	status_prompt_set(cdata->c, buf, NULL, cmd_confirm_before_callback,
! 	    cmd_confirm_before_free, cdata, PROMPT_SINGLE);
  
! 	xfree(buf);
  	return (1);
  }
  
--- 81,103 ----
  	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
  		return (-1);
  
! 	if ((prompt = args_get(args, 'p')) != NULL)
! 		xasprintf(&new_prompt, "%s ", prompt);
! 	else {
! 		ptr = copy = xstrdup(args->argv[0]);
! 		cmd = strsep(&ptr, " \t");
! 		xasprintf(&new_prompt, "Confirm '%s'? (y/n) ", cmd);
! 		xfree(copy);
! 	}
  
  	cdata = xmalloc(sizeof *cdata);
  	cdata->cmd = xstrdup(args->argv[0]);
  	cdata->c = c;
! 	status_prompt_set(cdata->c, new_prompt, NULL,
! 	    cmd_confirm_before_callback, cmd_confirm_before_free, cdata,
! 	    PROMPT_SINGLE);
  
! 	xfree(new_prompt);
  	return (1);
  }