===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- src/usr.bin/tmux/tmux.h	2009/12/01 18:42:38	1.190
+++ src/usr.bin/tmux/tmux.h	2009/12/03 17:44:02	1.191
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.190 2009/12/01 18:42:38 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.191 2009/12/03 17:44:02 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1233,8 +1233,6 @@
 
 	const char     **choices;
 };
-extern const struct set_option_entry set_option_table[];
-extern const struct set_option_entry set_window_option_table[];
 
 /* tmux.c */
 extern struct options global_s_options;
@@ -1377,24 +1375,6 @@
 void	tty_keys_free(struct tty *);
 int	tty_keys_next(struct tty *);
 
-/* options-cmd.c */
-const char *set_option_print(
-    	    const struct set_option_entry *, struct options_entry *);
-void	set_option_string(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *, int);
-void	set_option_number(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-void	set_option_keys(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-void	set_option_colour(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-void	set_option_attributes(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-void	set_option_flag(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-void	set_option_choice(struct cmd_ctx *,
-    	    struct options *, const struct set_option_entry *, char *);
-
 /* paste.c */
 void		 paste_init_stack(struct paste_stack *);
 void		 paste_free_stack(struct paste_stack *);
@@ -1409,6 +1389,12 @@
 /* clock.c */
 extern const char clock_table[14][5][5];
 void		 clock_draw(struct screen_write_ctx *, int, int);
+
+/* cmd-set-option.c */
+extern const struct set_option_entry set_session_option_table[];
+extern const struct set_option_entry set_window_option_table[];
+const char 	*cmd_set_option_print(
+		    const struct set_option_entry *, struct options_entry *);
 
 /* cmd.c */
 int		 cmd_pack_argv(int, char **, char *, size_t);