diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-12 20:01:15 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-12 20:01:15 +0000 |
| commit | 845a664bb2d06ac1cdc0af37d753d107f4353955 (patch) | |
| tree | bdd2832180ef678265972308ed08e71ab0bbab60 /cmd-unbind-key.c | |
| parent | 5a5db02b8514eff40b97b3f3e4e85a3d948b57da (diff) | |
| parent | 5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff) | |
| download | rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.gz rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.bz2 rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-unbind-key.c')
| -rw-r--r-- | cmd-unbind-key.c | 8 |
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); |