===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- src/usr.bin/tmux/format.c	2015/10/27 09:28:31	1.89
+++ src/usr.bin/tmux/format.c	2015/10/27 15:58:42	1.90
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.89 2015/10/27 09:28:31 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.90 2015/10/27 15:58:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -581,15 +581,15 @@
 	found = NULL;
 
 	if (~modifiers & FORMAT_TIMESTRING) {
-		o = options_find(&global_options, key);
+		o = options_find(global_options, key);
 		if (o == NULL && ft->w != NULL)
-			o = options_find(&ft->w->options, key);
+			o = options_find(ft->w->options, key);
 		if (o == NULL)
-			o = options_find(&global_w_options, key);
+			o = options_find(global_w_options, key);
 		if (o == NULL && ft->s != NULL)
-			o = options_find(&ft->s->options, key);
+			o = options_find(ft->s->options, key);
 		if (o == NULL)
-			o = options_find(&global_s_options, key);
+			o = options_find(global_s_options, key);
 		if (o != NULL) {
 			switch (o->type) {
 			case OPTIONS_STRING:
@@ -1101,7 +1101,7 @@
 
 	format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);
 	format_add(ft, "pane_synchronized", "%d",
-	    !!options_get_number(&wp->window->options, "synchronize-panes"));
+	    !!options_get_number(wp->window->options, "synchronize-panes"));
 
 	format_add(ft, "pane_tty", "%s", wp->tty);
 	format_add(ft, "pane_pid", "%ld", (long) wp->pid);