===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- src/usr.bin/tmux/cmd-set-option.c	2015/09/14 13:22:02	1.83
+++ src/usr.bin/tmux/cmd-set-option.c	2015/10/27 15:58:42	1.84
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.83 2015/09/14 13:22:02 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.84 2015/10/27 15:58:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -126,10 +126,10 @@
 
 	/* Work out the tree from the table. */
 	if (table == server_options_table)
-		oo = &global_options;
+		oo = global_options;
 	else if (table == window_options_table) {
 		if (args_has(self->args, 'g'))
-			oo = &global_w_options;
+			oo = global_w_options;
 		else {
 			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
 			if (wl == NULL) {
@@ -139,11 +139,11 @@
 				    'g')) ? " need target window or -g" : "");
 				return (CMD_RETURN_ERROR);
 			}
-			oo = &wl->window->options;
+			oo = wl->window->options;
 		}
 	} else if (table == session_options_table) {
 		if (args_has(self->args, 'g'))
-			oo = &global_s_options;
+			oo = global_s_options;
 		else {
 			s = cmd_find_session(cmdq, args_get(args, 't'), 0);
 			if (s == NULL) {
@@ -153,7 +153,7 @@
 				    'g')) ? " need target session or -g" : "");
 				return (CMD_RETURN_ERROR);
 			}
-			oo = &s->options;
+			oo = s->options;
 		}
 	} else {
 		cmdq_error(cmdq, "unknown table");
@@ -179,7 +179,7 @@
 	/* Start or stop timers if necessary. */
 	if (strcmp(oe->name, "automatic-rename") == 0) {
 		RB_FOREACH(w, windows, &windows) {
-			if (options_get_number(&w->options, "automatic-rename"))
+			if (options_get_number(w->options, "automatic-rename"))
 				w->active->flags |= PANE_CHANGED;
 		}
 	}
@@ -210,25 +210,25 @@
 	struct options	*oo;
 
 	if (args_has(args, 's'))
-		oo = &global_options;
+		oo = global_options;
 	else if (args_has(self->args, 'w') ||
 	    self->entry == &cmd_set_window_option_entry) {
 		if (args_has(self->args, 'g'))
-			oo = &global_w_options;
+			oo = global_w_options;
 		else {
 			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
 			if (wl == NULL)
 				return (CMD_RETURN_ERROR);
-			oo = &wl->window->options;
+			oo = wl->window->options;
 		}
 	} else {
 		if (args_has(self->args, 'g'))
-			oo = &global_s_options;
+			oo = global_s_options;
 		else {
 			s = cmd_find_session(cmdq, args_get(args, 't'), 0);
 			if (s == NULL)
 				return (CMD_RETURN_ERROR);
-			oo = &s->options;
+			oo = s->options;
 		}
 	}
 
@@ -276,7 +276,7 @@
 		return (-1);
 	}
 
-	if (args_has(args, 'g') || oo == &global_options) {
+	if (args_has(args, 'g') || oo == global_options) {
 		switch (oe->type) {
 		case OPTIONS_TABLE_STRING:
 			options_set_string(oo, oe->name, "%s", oe->default_str);