===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- src/usr.bin/tmux/cmd-set-option.c	2015/04/24 23:17:11	1.74
+++ src/usr.bin/tmux/cmd-set-option.c	2015/06/04 14:29:33	1.75
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.74 2015/04/24 23:17:11 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.75 2015/06/04 14:29:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -266,16 +266,25 @@
 {
 	struct args	*args = self->args;
 
-	if (args_has(args, 'g')) {
-		cmdq_error(cmdq, "can't unset global option: %s", oe->name);
-		return (-1);
-	}
 	if (value != NULL) {
 		cmdq_error(cmdq, "value passed to unset option: %s", oe->name);
 		return (-1);
 	}
 
-	options_remove(oo, oe->name);
+	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);
+			break;
+		case OPTIONS_TABLE_STYLE:
+			options_set_style(oo, oe->name, oe->default_str, 0);
+			break;
+		default:
+			options_set_number(oo, oe->name, oe->default_num);
+			break;
+		}
+	} else
+		options_remove(oo, oe->name);
 	return (0);
 }