===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -c -r1.125 -r1.126
*** src/usr.bin/tmux/server-client.c	2014/10/02 09:31:30	1.125
--- src/usr.bin/tmux/server-client.c	2014/10/22 23:18:53	1.126
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.125 2014/10/02 09:31:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.126 2014/10/22 23:18:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 160,166 ****
  	evbuffer_free(c->stdin_data);
  	evbuffer_free(c->stdout_data);
  	if (c->stderr_data != c->stdout_data)
! 		evbuffer_free (c->stderr_data);
  
  	status_free_jobs(&c->status_new);
  	status_free_jobs(&c->status_old);
--- 160,166 ----
  	evbuffer_free(c->stdin_data);
  	evbuffer_free(c->stdout_data);
  	if (c->stderr_data != c->stdout_data)
! 		evbuffer_free(c->stderr_data);
  
  	status_free_jobs(&c->status_new);
  	status_free_jobs(&c->status_old);
***************
*** 638,644 ****
  	if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
  		tty_cursor(&c->tty, 0, 0);
  	else {
! 		o = status && options_get_number (oo, "status-position") == 0;
  		tty_cursor(&c->tty, wp->xoff + s->cx, o + wp->yoff + s->cy);
  	}
  
--- 638,644 ----
  	if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
  		tty_cursor(&c->tty, 0, 0);
  	else {
! 		o = status && options_get_number(oo, "status-position") == 0;
  		tty_cursor(&c->tty, wp->xoff + s->cx, o + wp->yoff + s->cy);
  	}