===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/layout-set.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/layout-set.c	2010/12/19 18:35:08	1.8
--- src/usr.bin/tmux/layout-set.c	2011/03/07 23:55:16	1.9
***************
*** 1,4 ****
! /* $OpenBSD: layout-set.c,v 1.8 2010/12/19 18:35:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: layout-set.c,v 1.9 2011/03/07 23:55:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 519,525 ****
  		TAILQ_INSERT_TAIL(&lc->cells, lcrow, entry);
  
  		/* If only one column, just use the row directly. */
! 		if (n - (j * columns) == 1) {
  			layout_make_leaf(lcrow, wp);
  			wp = TAILQ_NEXT(wp, entry);
  			continue;
--- 519,525 ----
  		TAILQ_INSERT_TAIL(&lc->cells, lcrow, entry);
  
  		/* If only one column, just use the row directly. */
! 		if (n - (j * columns) == 1 || columns == 1) {
  			layout_make_leaf(lcrow, wp);
  			wp = TAILQ_NEXT(wp, entry);
  			continue;