summaryrefslogtreecommitdiffstats
path: root/cmd-unbind-key.c
diff options
context:
space:
mode:
authornicm <nicm>2015-12-12 18:19:00 +0000
committernicm <nicm>2015-12-12 18:19:00 +0000
commit39cf9c9d31954198ad73e2b6721a92fe782ee56c (patch)
tree8b2a0238d0d1ccf01232a2f45560dd5b0c9259fe /cmd-unbind-key.c
parent88bc8f3528b973adb17f541e21aa415923a10f1e (diff)
Allow prefix and prefix2 to be set to None to disable (useful if you
would rather bind the prefix in the root table).
Diffstat (limited to 'cmd-unbind-key.c')
-rw-r--r--cmd-unbind-key.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
index cec538c0..66a4525e 100644
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -51,7 +51,7 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
key = key_string_lookup_string(args->argv[0]);
- if (key == KEYC_NONE) {
+ if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
return (CMD_RETURN_ERROR);
}
@@ -60,13 +60,13 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq_error(cmdq, "key given with -a");
return (CMD_RETURN_ERROR);
}
- key = KEYC_NONE;
+ key = KEYC_UNKNOWN;
}
if (args_has(args, 't'))
return (cmd_unbind_key_mode_table(self, cmdq, key));
- if (key == KEYC_NONE) {
+ if (key == KEYC_UNKNOWN) {
tablename = args_get(args, 'T');
if (tablename == NULL) {
key_bindings_remove_table("root");
@@ -109,7 +109,7 @@ cmd_unbind_key_mode_table(struct cmd *self, struct cmd_q *cmdq, key_code key)
return (CMD_RETURN_ERROR);
}
- if (key == KEYC_NONE) {
+ if (key == KEYC_UNKNOWN) {
while (!RB_EMPTY(mtab->tree)) {
mbind = RB_ROOT(mtab->tree);
RB_REMOVE(mode_key_tree, mtab->tree, mbind);