===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/tmux/cmd-show-options.c	2009/12/03 22:50:10	1.9
+++ src/usr.bin/tmux/cmd-show-options.c	2009/12/10 09:16:52	1.10
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-show-options.c,v 1.9 2009/12/03 22:50:10 nicm Exp $ */
+/* $OpenBSD: cmd-show-options.c,v 1.10 2009/12/10 09:16:52 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,8 +31,8 @@
 
 const struct cmd_entry cmd_show_options_entry = {
 	"show-options", "show",
-	"[-gw] [-t target-session|target-window]",
-	0, "gw",
+	"[-gsw] [-t target-session|target-window]",
+	0, "gsw",
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_show_options_exec,
@@ -52,7 +52,10 @@
 	const struct set_option_entry   *entry;
 	const char			*optval;
 
-	if (cmd_check_flag(data->chflags, 'w')) {
+	if (cmd_check_flag(data->chflags, 's')) {
+		oo = &global_options;
+		table = set_option_table;
+	} else if (cmd_check_flag(data->chflags, 'w')) {
 		table = set_window_option_table;
 		if (cmd_check_flag(data->chflags, 'g'))
 			oo = &global_w_options;