===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-choose-window.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/usr.bin/tmux/Attic/cmd-choose-window.c	2012/05/22 11:35:37	1.19
+++ src/usr.bin/tmux/Attic/cmd-choose-window.c	2012/05/29 08:15:45	1.20
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-choose-window.c,v 1.19 2012/05/22 11:35:37 nicm Exp $ */
+/* $OpenBSD: cmd-choose-window.c,v 1.20 2012/05/29 08:15:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -72,7 +72,7 @@
 		return (0);
 
 	if ((template = args_get(args, 'F')) == NULL)
-		template = DEFAULT_WINDOW_TEMPLATE;
+		template = DEFAULT_WINDOW_TEMPLATE " \"#{pane_title}\"";
 
 	cur = idx = 0;
 	RB_FOREACH(wm, winlinks, &s->windows) {
@@ -84,9 +84,10 @@
 		format_add(ft, "line", "%u", idx);
 		format_session(ft, s);
 		format_winlink(ft, s, wm);
+		format_window_pane(ft, wm->window->active);
 
 		line = format_expand(ft, template);
-		window_choose_add(wl->window->active, idx, "%s", line);
+		window_choose_add(wl->window->active, wm->idx, "%s", line);
 
 		xfree(line);
 		format_free(ft);