===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/window.c	2009/08/11 21:28:11	1.19
--- src/usr.bin/tmux/window.c	2009/08/12 09:14:25	1.20
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.19 2009/08/11 21:28:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.20 2009/08/12 09:14:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 62,67 ****
--- 62,68 ----
  window_default_command(void)
  {
  	const char	*shell, *ptr;
+ 	char		*progname;
  	struct passwd	*pw;
  
  	shell = getenv("SHELL");
***************
*** 81,87 ****
  		ptr++;
  	else
  		ptr = shell;
! 	if (strcmp(ptr, __progname) == 0)
  		return (_PATH_BSHELL);
  	return (shell);
  }
--- 82,91 ----
  		ptr++;
  	else
  		ptr = shell;
! 	progname = __progname;
! 	if (*progname == '-')
! 		progname++;
! 	if (strcmp(ptr, progname) == 0)
  		return (_PATH_BSHELL);
  	return (shell);
  }