===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/tmux/cmd-list-windows.c	2012/01/30 20:39:56	1.18
--- src/usr.bin/tmux/cmd-list-windows.c	2012/05/22 11:35:37	1.19
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.18 2012/01/30 20:39:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.19 2012/05/22 11:35:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 34,40 ****
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
! 	"aF:t:", 0, 0,
  	"[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
  	0,
  	NULL,
--- 34,40 ----
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
! 	"F:at:", 0, 0,
  	"[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
  	0,
  	NULL,
***************
*** 84,101 ****
  	if (template == NULL) {
  		switch (type) {
  		case 0:
! 			template = "#{window_index}: "
! 			    "#{window_name} "
! 			    "[#{window_width}x#{window_height}] "
! 			    "[layout #{window_layout}] #{window_id}"
! 			    "#{?window_active, (active),}";
  			break;
  		case 1:
! 			template = "#{session_name}:#{window_index}: "
! 			    "#{window_name} "
! 			    "[#{window_width}x#{window_height}] "
! 			    "[layout #{window_layout}] #{window_id}"
! 			    "#{?window_active, (active),}";
  			break;
  		}
  	}
--- 84,93 ----
  	if (template == NULL) {
  		switch (type) {
  		case 0:
! 			template = DEFAULT_WINDOW_TEMPLATE;
  			break;
  		case 1:
! 			template = "#{session_name}:" DEFAULT_WINDOW_TEMPLATE;
  			break;
  		}
  	}