===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/resize.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/resize.c	2015/04/24 23:17:11	1.17
--- src/usr.bin/tmux/resize.c	2015/10/27 15:58:42	1.18
***************
*** 1,4 ****
! /* $OpenBSD: resize.c,v 1.17 2015/04/24 23:17:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: resize.c,v 1.18 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 53,59 ****
  	int			 flag, has_status, is_zoomed, forced;
  
  	RB_FOREACH(s, sessions, &sessions) {
! 		has_status = options_get_number(&s->options, "status");
  
  		s->attached = 0;
  		ssx = ssy = UINT_MAX;
--- 53,59 ----
  	int			 flag, has_status, is_zoomed, forced;
  
  	RB_FOREACH(s, sessions, &sessions) {
! 		has_status = options_get_number(s->options, "status");
  
  		s->attached = 0;
  		ssx = ssy = UINT_MAX;
***************
*** 94,100 ****
  	RB_FOREACH(w, windows, &windows) {
  		if (w->active == NULL)
  			continue;
! 		flag = options_get_number(&w->options, "aggressive-resize");
  
  		ssx = ssy = UINT_MAX;
  		RB_FOREACH(s, sessions, &sessions) {
--- 94,100 ----
  	RB_FOREACH(w, windows, &windows) {
  		if (w->active == NULL)
  			continue;
! 		flag = options_get_number(w->options, "aggressive-resize");
  
  		ssx = ssy = UINT_MAX;
  		RB_FOREACH(s, sessions, &sessions) {
***************
*** 115,126 ****
  			continue;
  
  		forced = 0;
! 		limit = options_get_number(&w->options, "force-width");
  		if (limit >= PANE_MINIMUM && ssx > limit) {
  			ssx = limit;
  			forced |= WINDOW_FORCEWIDTH;
  		}
! 		limit = options_get_number(&w->options, "force-height");
  		if (limit >= PANE_MINIMUM && ssy > limit) {
  			ssy = limit;
  			forced |= WINDOW_FORCEHEIGHT;
--- 115,126 ----
  			continue;
  
  		forced = 0;
! 		limit = options_get_number(w->options, "force-width");
  		if (limit >= PANE_MINIMUM && ssx > limit) {
  			ssx = limit;
  			forced |= WINDOW_FORCEWIDTH;
  		}
! 		limit = options_get_number(w->options, "force-height");
  		if (limit >= PANE_MINIMUM && ssy > limit) {
  			ssy = limit;
  			forced |= WINDOW_FORCEHEIGHT;