===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-unbind-key.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/tmux/cmd-unbind-key.c	2012/01/21 11:12:13	1.12
+++ src/usr.bin/tmux/cmd-unbind-key.c	2012/05/05 17:40:47	1.13
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-unbind-key.c,v 1.12 2012/01/21 11:12:13 nicm Exp $ */
+/* $OpenBSD: cmd-unbind-key.c,v 1.13 2012/05/05 17:40:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,8 +42,8 @@
 int
 cmd_unbind_key_check(struct args *args)
 {
-	if (args_has(args, 'a') && (args->argc != 0 || args_has(args, 't')))
-	    return (-1);
+	if (args_has(args, 'a') && args->argc != 0)
+		return (-1);
 	if (!args_has(args, 'a') && args->argc != 1)
 		return (-1);
 	return (0);
@@ -56,7 +56,19 @@
 	struct key_binding	*bd;
 	int			 key;
 
-	if (args_has(args, 'a')) {
+	if (!args_has(args, 'a')) {
+		key = key_string_lookup_string(args->argv[0]);
+		if (key == KEYC_NONE) {
+			ctx->error(ctx, "unknown key: %s", args->argv[0]);
+			return (-1);
+		}
+	} else
+		key = KEYC_NONE;
+
+	if (args_has(args, 't'))
+		return (cmd_unbind_key_table(self, ctx, key));
+
+	if (key == KEYC_NONE) {
 		while (!RB_EMPTY(&key_bindings)) {
 			bd = RB_ROOT(&key_bindings);
 			key_bindings_remove(bd->key);
@@ -64,15 +76,6 @@
 		return (0);
 	}
 
-	key = key_string_lookup_string(args->argv[0]);
-	if (key == KEYC_NONE) {
-		ctx->error(ctx, "unknown key: %s", args->argv[0]);
-		return (-1);
-	}
-
-	if (args_has(args, 't'))
-		return (cmd_unbind_key_table(self, ctx, key));
-
 	if (!args_has(args, 'n'))
 		key |= KEYC_PREFIX;
 	key_bindings_remove(key);
@@ -91,6 +94,15 @@
 	if ((mtab = mode_key_findtable(tablename)) == NULL) {
 		ctx->error(ctx, "unknown key table: %s", tablename);
 		return (-1);
+	}
+
+	if (key == KEYC_NONE) {
+		while (!RB_EMPTY(mtab->tree)) {
+			mbind = RB_ROOT(mtab->tree);
+			RB_REMOVE(mode_key_tree, mtab->tree, mbind);
+			xfree(mbind);
+		}
+		return (0);
 	}
 
 	mtmp.key = key;