===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- src/usr.bin/tmux/Attic/window-choose.c	2013/03/22 15:54:29	1.44
+++ src/usr.bin/tmux/Attic/window-choose.c	2013/03/24 09:54:10	1.45
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-choose.c,v 1.44 2013/03/22 15:54:29 nicm Exp $ */
+/* $OpenBSD: window-choose.c,v 1.45 2013/03/24 09:54:10 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -200,9 +200,8 @@
 void
 window_choose_data_run(struct window_choose_data *cdata)
 {
-	struct cmd_ctx		*ctx;
-	struct cmd_list		*cmdlist;
-	char			*cause;
+	struct cmd_list	*cmdlist;
+	char		*cause;
 
 	/*
 	 * The command template will have already been replaced. But if it's
@@ -211,7 +210,7 @@
 	if (cdata->command == NULL)
 		return;
 
-	if (cmd_string_parse(cdata->command, &cmdlist, &cause) != 0) {
+	if (cmd_string_parse(cdata->command, &cmdlist, NULL, 0, &cause) != 0) {
 		if (cause != NULL) {
 			*cause = toupper((u_char) *cause);
 			status_message_set(cdata->start_client, "%s", cause);
@@ -220,14 +219,8 @@
 		return;
 	}
 
-	ctx = cmd_get_ctx(NULL, cdata->start_client);
-	ctx->error = key_bindings_error;
-	ctx->print = key_bindings_print;
-	ctx->info = key_bindings_info;
-
-	cmd_list_exec(cmdlist, ctx);
+	cmdq_run(cdata->start_client->cmdq, cmdlist);
 	cmd_list_free(cmdlist);
-	cmd_free_ctx(ctx);
 }
 
 void