===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- src/usr.bin/tmux/cmd-set-option.c	2017/01/15 20:50:34	1.106
+++ src/usr.bin/tmux/cmd-set-option.c	2017/01/16 14:49:14	1.107
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.106 2017/01/15 20:50:34 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.107 2017/01/16 14:49:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -30,7 +30,7 @@
 static enum cmd_retval	cmd_set_option_exec(struct cmd *, struct cmdq_item *);
 
 static int	cmd_set_option_set(struct cmd *, struct cmdq_item *,
-		    struct options *, struct option *, const char *);
+		    struct options *, struct options_entry *, const char *);
 static int	cmd_set_option_flag(struct cmdq_item *,
 		    const struct options_table_entry *, struct options *,
 		    const char *);
@@ -75,7 +75,7 @@
 	struct client			*c;
 	enum options_table_scope	 scope;
 	struct options			*oo;
-	struct option			*parent, *o;
+	struct options_entry		*parent, *o;
 	const char			*name, *value, *target;
 	int				 window, idx, already, error, ambiguous;
 	char				*cause;
@@ -256,12 +256,12 @@
 
 static int
 cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo,
-    struct option *parent, const char *value)
+    struct options_entry *parent, const char *value)
 {
 	const struct options_table_entry	*oe;
 	struct args				*args = self->args;
 	int					 append = args_has(args, 'a');
-	struct option				*o;
+	struct options_entry			*o;
 	long long				 number;
 	const char				*errstr;
 	key_code				 key;