===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -c -r1.104 -r1.105
*** src/usr.bin/tmux/window.c	2014/04/17 07:36:45	1.104
--- src/usr.bin/tmux/window.c	2014/04/17 09:13:13	1.105
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.104 2014/04/17 07:36:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.105 2014/04/17 09:13:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 591,597 ****
  }
  
  void
! window_remove_pane(struct window *w, struct window_pane *wp)
  {
  	if (wp == w->active) {
  		w->active = w->last;
--- 591,597 ----
  }
  
  void
! window_lost_pane(struct window *w, struct window_pane *wp)
  {
  	if (wp == w->active) {
  		w->active = w->last;
***************
*** 603,608 ****
--- 603,614 ----
  		}
  	} else if (wp == w->last)
  		w->last = NULL;
+ }
+ 
+ void
+ window_remove_pane(struct window *w, struct window_pane *wp)
+ {
+ 	window_lost_pane(w, wp);
  
  	TAILQ_REMOVE(&w->panes, wp, entry);
  	window_pane_destroy(wp);