===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- src/usr.bin/tmux/window.c	2015/09/14 11:34:50	1.145
+++ src/usr.bin/tmux/window.c	2015/10/27 15:58:43	1.146
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.145 2015/09/14 11:34:50 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.146 2015/10/27 15:58:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -302,7 +302,7 @@
 	w->sx = sx;
 	w->sy = sy;
 
-	options_init(&w->options, &global_w_options);
+	w->options = options_create(global_w_options);
 
 	w->references = 0;
 
@@ -335,7 +335,7 @@
 	w->active = TAILQ_FIRST(&w->panes);
 	if (name != NULL) {
 		w->name = xstrdup(name);
-		options_set_number(&w->options, "automatic-rename", 0);
+		options_set_number(w->options, "automatic-rename", 0);
 	} else
 		w->name = default_window_name(w);
 
@@ -359,7 +359,7 @@
 	if (event_initialized(&w->alerts_timer))
 		evtimer_del(&w->alerts_timer);
 
-	options_free(&w->options);
+	options_free(w->options);
 
 	window_destroy_panes(w);
 
@@ -437,8 +437,8 @@
 	 * active or inactive pane do not have a custom style, they will need
 	 * to be redrawn.
 	 */
-	agc = options_get_style(&w->options, "window-active-style");
-	wgc = options_get_style(&w->options, "window-style");
+	agc = options_get_style(w->options, "window-active-style");
+	wgc = options_get_style(w->options, "window-style");
 	if (style_equal(agc, wgc))
 		return;
 	if (style_equal(&grid_default_cell, &w->active->colgc))
@@ -598,7 +598,7 @@
 	struct window_pane	*wp;
 	u_int			 n;
 
-	n = options_get_number(&w->options, "pane-base-index");
+	n = options_get_number(w->options, "pane-base-index");
 	TAILQ_FOREACH(wp, &w->panes, entry) {
 		if (n == idx)
 			return (wp);
@@ -636,7 +636,7 @@
 	struct window_pane	*wq;
 	struct window		*w = wp->window;
 
-	*i = options_get_number(&w->options, "pane-base-index");
+	*i = options_get_number(w->options, "pane-base-index");
 	TAILQ_FOREACH(wq, &w->panes, entry) {
 		if (wp == wq) {
 			return (0);
@@ -1002,7 +1002,7 @@
 
 	if (wp->saved_grid != NULL)
 		return;
-	if (!options_get_number(&wp->window->options, "alternate-screen"))
+	if (!options_get_number(wp->window->options, "alternate-screen"))
 		return;
 	sx = screen_size_x(s);
 	sy = screen_size_y(s);
@@ -1032,7 +1032,7 @@
 
 	if (wp->saved_grid == NULL)
 		return;
-	if (!options_get_number(&wp->window->options, "alternate-screen"))
+	if (!options_get_number(wp->window->options, "alternate-screen"))
 		return;
 	sx = screen_size_x(s);
 	sy = screen_size_y(s);
@@ -1120,7 +1120,7 @@
 
 	if (KEYC_IS_MOUSE(key))
 		return;
-	if (options_get_number(&wp->window->options, "synchronize-panes")) {
+	if (options_get_number(wp->window->options, "synchronize-panes")) {
 		TAILQ_FOREACH(wp2, &wp->window->panes, entry) {
 			if (wp2 == wp || wp2->mode != NULL)
 				continue;