===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/cmd-new-session.c	2009/06/01 22:58:49	1.1
--- src/usr.bin/tmux/cmd-new-session.c	2009/07/07 19:49:19	1.2
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.2 2009/07/07 19:49:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 137,145 ****
  
  	cmd = data->cmd;
  	if (cmd == NULL)
! 		cmd = options_get_string(&global_options, "default-command");
  	if (c == NULL || c->cwd == NULL)
! 		cwd = options_get_string(&global_options, "default-path");
  	else
  		cwd = c->cwd;
  
--- 137,145 ----
  
  	cmd = data->cmd;
  	if (cmd == NULL)
! 		cmd = options_get_string(&global_s_options, "default-command");
  	if (c == NULL || c->cwd == NULL)
! 		cwd = options_get_string(&global_s_options, "default-path");
  	else
  		cwd = c->cwd;
  
***************
*** 150,156 ****
  		sy = c->tty.sy;
  	}
  
! 	if (options_get_number(&global_options, "status")) {
  		if (sy == 0)
  			sy = 1;
  		else
--- 150,156 ----
  		sy = c->tty.sy;
  	}
  
! 	if (options_get_number(&global_s_options, "status")) {
  		if (sy == 0)
  			sy = 1;
  		else