===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-layout.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-select-layout.c	2010/04/25 20:28:13	1.9
--- src/usr.bin/tmux/cmd-select-layout.c	2010/06/29 03:30:13	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-layout.c,v 1.9 2010/04/25 20:28:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-layout.c,v 1.10 2010/06/29 03:30:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 79,91 ****
  		layout = wl->window->lastlayout;
  		if (layout == -1)
  			return (0);
! 	} else if ((layout = layout_set_lookup(data->arg)) == -1) {
! 		ctx->error(ctx, "unknown layout or ambiguous: %s", data->arg);
! 		return (-1);
  	}
- 
- 	layout = layout_set_select(wl->window, layout);
- 	ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
  
  	return (0);
  }
--- 79,94 ----
  		layout = wl->window->lastlayout;
  		if (layout == -1)
  			return (0);
! 	} else if ((layout = layout_set_lookup(data->arg)) != -1) {
! 		layout = layout_set_select(wl->window, layout);
! 		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
! 	} else {
! 		if (layout_parse(wl->window, data->arg) == -1) {
! 			ctx->error(ctx, "can't set layout: %s", data->arg);
! 			return (-1);
! 		}
! 		ctx->info(ctx, "arranging in: %s", data->arg);
  	}
  
  	return (0);
  }