===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/server.c	2009/07/18 14:59:25	1.10
--- src/usr.bin/tmux/server.c	2009/07/19 13:21:40	1.11
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.10 2009/07/18 14:59:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.11 2009/07/19 13:21:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 840,846 ****
  
  	/* Ensure cursor position and mode settings. */
  	status = options_get_number(&c->session->options, "status");
! 	if (wp->yoff + s->cy < c->tty.sy - status)
  		tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
  
  	mode = s->mode;
--- 840,848 ----
  
  	/* Ensure cursor position and mode settings. */
  	status = options_get_number(&c->session->options, "status");
! 	if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
! 		tty_cursor(&c->tty, 0, 0, 0, 0);
! 	else
  		tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
  
  	mode = s->mode;
***************
*** 1072,1080 ****
  		 * pane dies).
  		 */
  		if (wp->fd == -1 && !flag) {
  			window_remove_pane(w, wp);
  			server_redraw_window(w);
- 			layout_refresh(w, 0);
  		} else 
  			destroyed = 0;
  		wp = wq;
--- 1074,1082 ----
  		 * pane dies).
  		 */
  		if (wp->fd == -1 && !flag) {
+ 			layout_close_pane(wp);
  			window_remove_pane(w, wp);
  			server_redraw_window(w);
  		} else 
  			destroyed = 0;
  		wp = wq;