===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/usr.bin/tmux/tmux.h	2009/08/31 20:46:19	1.92
--- src/usr.bin/tmux/tmux.h	2009/09/01 13:09:50	1.93
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.92 2009/08/31 20:46:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.93 2009/09/01 13:09:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 675,680 ****
--- 675,681 ----
  #define PANE_REDRAW 0x1
  
  	char		*cmd;
+ 	char		*shell;
  	char		*cwd;
  
  	pid_t		 pid;
***************
*** 1117,1122 ****
--- 1118,1126 ----
  void		 siginit(void);
  void		 sigreset(void);
  void		 sighandler(int);
+ const char	*getshell(void);
+ int		 checkshell(const char *);
+ int		 areshell(const char *);
  
  /* cfg.c */
  int		 load_cfg(const char *, struct cmd_ctx *, char **);
***************
*** 1582,1588 ****
  
  /* window.c */
  extern struct windows windows;
- const char	*window_default_command(void);
  int		 window_cmp(struct window *, struct window *);
  int		 winlink_cmp(struct winlink *, struct winlink *);
  RB_PROTOTYPE(windows, window, entry, window_cmp);
--- 1586,1591 ----
***************
*** 1600,1607 ****
  int	 	 window_index(struct window *, u_int *);
  struct window	*window_create1(u_int, u_int);
  struct window	*window_create(const char *, const char *, const char *,
!     		     struct environ *, struct termios *, u_int, u_int, u_int,
! 		     char **);
  void		 window_destroy(struct window *);
  void		 window_set_active_pane(struct window *, struct window_pane *);
  struct window_pane *window_add_pane(struct window *, u_int);
--- 1603,1610 ----
  int	 	 window_index(struct window *, u_int *);
  struct window	*window_create1(u_int, u_int);
  struct window	*window_create(const char *, const char *, const char *,
! 		     const char *, struct environ *, struct termios *,
!     		     u_int, u_int, u_int, char **);
  void		 window_destroy(struct window *);
  void		 window_set_active_pane(struct window *, struct window_pane *);
  struct window_pane *window_add_pane(struct window *, u_int);
***************
*** 1614,1620 ****
  struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int);
  void		 window_pane_destroy(struct window_pane *);
  int		 window_pane_spawn(struct window_pane *, const char *,
! 		     const char *, struct environ *, struct termios *, char **);
  void		 window_pane_resize(struct window_pane *, u_int, u_int);
  int		 window_pane_set_mode(
  		     struct window_pane *, const struct window_mode *);
--- 1617,1624 ----
  struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int);
  void		 window_pane_destroy(struct window_pane *);
  int		 window_pane_spawn(struct window_pane *, const char *,
! 		     const char *, const char *, struct environ *,
! 		     struct termios *, char **);
  void		 window_pane_resize(struct window_pane *, u_int, u_int);
  int		 window_pane_set_mode(
  		     struct window_pane *, const struct window_mode *);