===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- src/usr.bin/tmux/Attic/window-choose.c	2013/03/22 10:38:33	1.40
+++ src/usr.bin/tmux/Attic/window-choose.c	2013/03/22 15:49:55	1.41
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-choose.c,v 1.40 2013/03/22 10:38:33 nicm Exp $ */
+/* $OpenBSD: window-choose.c,v 1.41 2013/03/22 15:49:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -200,7 +200,7 @@
 void
 window_choose_data_run(struct window_choose_data *cdata)
 {
-	struct cmd_ctx		 ctx;
+	struct cmd_ctx		*ctx;
 	struct cmd_list		*cmdlist;
 	char			*cause;
 
@@ -220,17 +220,18 @@
 		return;
 	}
 
-	ctx.msgdata = NULL;
-	ctx.curclient = cdata->start_client;
+	ctx = cmd_get_ctx();
+	ctx->msgdata = NULL;
+	ctx->curclient = cdata->start_client;
+	ctx->cmdclient = NULL;
 
-	ctx.error = key_bindings_error;
-	ctx.print = key_bindings_print;
-	ctx.info = key_bindings_info;
+	ctx->error = key_bindings_error;
+	ctx->print = key_bindings_print;
+	ctx->info = key_bindings_info;
 
-	ctx.cmdclient = NULL;
-
-	cmd_list_exec(cmdlist, &ctx);
+	cmd_list_exec(cmdlist, ctx);
 	cmd_list_free(cmdlist);
+	cmd_free_ctx(ctx);
 }
 
 void